Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0983786c authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Remove Brillo-specific LOCAL_MODULE_TAGS" am: 11708e02 am: 5c72c968 

am: f8e59569

Change-Id: I346733f7277ade2001c562ee1d37e3a96ba22a4a
parents 0538bcd4 f8e59569

crash_reporter/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -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 \

metricsd/Android.mk

+0 −6
Original line number Diff line number Diff line
@@ -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