commit 9a5300fcb899d1b1a4118e2d050480b6146e96ea
author Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 02 23:01:54 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 02 23:01:54 2016 +0000
tree 966355f72c8eca59a25dbefecc915c8c79a4c8ef
parent 11708e023685ac14dba07d0ca2f6847989a20e1c
parent 1e73024653d962b769387dd4c9ff544b6c8b7cc9

Merge "Have init kill the process group."

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