diff options
author | Alex Deymo <deymo@google.com> | 2017-03-27 12:45:17 -0700 |
---|---|---|
committer | Alex Deymo <deymo@google.com> | 2017-03-27 12:59:11 -0700 |
commit | b610ef85f1f7a315510a1cf3c557533d043ef355 (patch) | |
tree | e2eb73dc31e38f5909cd4c437f2ea83bbf24375c /Android.mk | |
parent | a9a6af0e7b1caa54dad41cb184945e10e242cb38 (diff) | |
download | metricsd-main.tar.gz |
Bug: None
Test: `make checkbuild` without weave.
Change-Id: I9fa060ecdc5b563aa2c453152f86f586f75756ac
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 20 |
1 files changed, 0 insertions, 20 deletions
@@ -14,11 +14,6 @@ LOCAL_PATH := $(call my-dir) -# Default values for the USE flags. Override these USE flags from your product -# by setting BRILLO_USE_* values. Note that we define local variables like -# local_use_* to prevent leaking our default setting for other packages. -local_use_weave := $(if $(BRILLO_USE_WEAVE),$(BRILLO_USE_WEAVE),0) - metrics_cpp_extension := .cc libmetrics_sources := \ c_metrics_library.cc \ @@ -69,7 +64,6 @@ metrics_CFLAGS := -Wall \ -Werror \ -fvisibility=default metrics_CPPFLAGS := -Wno-non-virtual-dtor \ - -DUSE_WEAVE=$(local_use_weave) \ -Wno-sign-promo \ -Wno-strict-aliasing \ -fvisibility=default @@ -82,11 +76,6 @@ metrics_collector_shared_libraries := $(libmetrics_shared_libraries) \ libmetrics \ librootdev -ifeq ($(local_use_weave),1) -metrics_collector_shared_libraries += \ - libweaved -endif # local_use_weave == 1 - metrics_collector_static_libraries := libmetricscollectorservice metricsd_shared_libraries := \ @@ -231,12 +220,3 @@ ifdef BRILLO LOCAL_MODULE_TAGS := eng endif include $(BUILD_NATIVE_TEST) - -# Weave schema files -# ======================================================== -include $(CLEAR_VARS) -LOCAL_MODULE := metrics.json -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/weaved/traits -LOCAL_SRC_FILES := etc/weaved/traits/$(LOCAL_MODULE) -include $(BUILD_PREBUILT) |