commit 31c27249c37a5842cfbd4a18e8214acbc8927ade
author Jorge Lucangeli Obes <jorgelo@google.com> Thu Feb 04 22:31:40 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 04 22:31:40 2016 +0000
tree 28dd8007fe4fd81af09f21ca38e464c28b676b05
parent bcbe6fcc80c1e7a219458d63df9433a92221654d
parent 8484263d602acaf80095660fe3862a54e08041eb

Merge "Unit tests: Compile only on \'eng\' builds." am: 42a53e0c2a
am: 0995795e1f

* commit '0995795e1f257eca86266ed656fe57a634bc0694':
  Unit tests: Compile only on 'eng' builds.

metricsd/Android.mk

diff --git a/metricsd/Android.mk b/metricsd/Android.mk
index e140c62..bb262b4 100644
--- a/metricsd/Android.mk
+++ b/metricsd/Android.mk
@@ -200,7 +200,7 @@
 LOCAL_SRC_FILES := $(metricsd_tests_sources) $(metricsd_common)
 LOCAL_STATIC_LIBRARIES := libBionicGtestMain libgmock metricsd_protos metricsd_binder_proxy
 ifdef BRILLO
-LOCAL_MODULE_TAGS := debug
+LOCAL_MODULE_TAGS := eng
 endif
 include $(BUILD_NATIVE_TEST)
 
@@ -218,7 +218,7 @@
 LOCAL_STATIC_LIBRARIES := libBionicGtestMain libgmock metricsd_binder_proxy \
   $(metrics_collector_static_libraries)
 ifdef BRILLO
-LOCAL_MODULE_TAGS := debug
+LOCAL_MODULE_TAGS := eng
 endif
 include $(BUILD_NATIVE_TEST)