Merge "Remove Brillo-specific LOCAL_MODULE_TAGS"

am: 11708e0236

Change-Id: I36fe7de8fc5c4bc911c5860b33aef201adde0ed9
This commit is contained in:
Dan Willemsen 2016-08-02 20:41:06 +00:00 committed by android-build-merger
commit 5c72c9688f
2 changed files with 0 additions and 9 deletions

View File

@ -135,9 +135,6 @@ include $(BUILD_PREBUILT)
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 \

View File

@ -199,9 +199,6 @@ LOCAL_CPPFLAGS := $(metrics_CPPFLAGS) -Wno-sign-compare
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 @@ LOCAL_SRC_FILES := $(metrics_collector_tests_sources) \
$(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