commit 4190b9ba31d0b1e616687682269fe56616dc158d
author Bertrand Simonnet <bsimonnet@google.com> Wed Jan 20 02:31:33 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 20 02:31:33 2016 +0000
tree aecb281e55ef3fb9c5e84ca12ac0d5e1d91890df
parent cdc64fbd13552522f316fa5b4d7e6ecc32071332
parent e169e9ce7bc3b2683b14f85ddf2e222775acfb51

Merge "metricsd: Add tests to the default debug build." am: 7fbe8b9285
am: 3a6ccb35dc

* commit '3a6ccb35dc7d2bcadd9c5f7ed88c4e07e6a42242':
  metricsd: Add tests to the default debug build.

metricsd/Android.mk

diff --git a/metricsd/Android.mk b/metricsd/Android.mk
index ed3fcbb..250c657 100644
--- a/metricsd/Android.mk
+++ b/metricsd/Android.mk
@@ -202,6 +202,9 @@
 LOCAL_SHARED_LIBRARIES := $(metricsd_shared_libraries)
 LOCAL_SRC_FILES := $(metricsd_tests_sources) $(metricsd_common)
 LOCAL_STATIC_LIBRARIES := libBionicGtestMain libgmock metricsd_protos metricsd_binder_proxy
+ifdef BRILLO
+LOCAL_MODULE_TAGS := debug
+endif
 include $(BUILD_NATIVE_TEST)
 
 # Unit tests for metrics_collector.
@@ -217,6 +220,9 @@
   $(metrics_collector_common)
 LOCAL_STATIC_LIBRARIES := libBionicGtestMain libgmock metricsd_binder_proxy \
   $(metrics_collector_static_libraries)
+ifdef BRILLO
+LOCAL_MODULE_TAGS := debug
+endif
 include $(BUILD_NATIVE_TEST)
 
 # Weave schema files