commit bacd060e702effc8ee8b74ed8718b48b1f8a5e84
author Dan Willemsen <dwillemsen@google.com> Tue Aug 02 20:41:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 02 20:41:06 2016 +0000
tree 6e9cbd65ea51347c51638936ae5cb2f2e0ace3db
parent 08c23bd9a913b8e7b0972e6868368eb04a6598d4
parent d28db79d303d6ee9f2d94ebe27a18fed61fe1f76

Merge "Remove Brillo-specific LOCAL_MODULE_TAGS"
am: 11708e0236

Change-Id: I36fe7de8fc5c4bc911c5860b33aef201adde0ed9

crash_reporter/Android.mk

diff --git a/crash_reporter/Android.mk b/crash_reporter/Android.mk
index ce9dc73..4feb72a 100644
--- a/crash_reporter/Android.mk
+++ b/crash_reporter/Android.mk
@@ -135,9 +135,6 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE := crash_reporter_tests
 LOCAL_CPP_EXTENSION := $(crash_reporter_cpp_extension)
-ifdef BRILLO
-LOCAL_MODULE_TAGS := eng
-endif
 LOCAL_SHARED_LIBRARIES := libchrome \
     libbrillo \
     libcutils \

metricsd/Android.mk

diff --git a/metricsd/Android.mk b/metricsd/Android.mk
index bb262b4..65ca1f6 100644
--- a/metricsd/Android.mk
+++ b/metricsd/Android.mk
@@ -199,9 +199,6 @@
 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 := eng
-endif
 include $(BUILD_NATIVE_TEST)
 
 # Unit tests for metrics_collector.
@@ -217,9 +214,6 @@
   $(metrics_collector_common)
 LOCAL_STATIC_LIBRARIES := libBionicGtestMain libgmock metricsd_binder_proxy \
   $(metrics_collector_static_libraries)
-ifdef BRILLO
-LOCAL_MODULE_TAGS := eng
-endif
 include $(BUILD_NATIVE_TEST)
 
 # Weave schema files