diff options
| author | Alex Vakulenko <avakulenko@google.com> | 2015-12-09 12:34:18 -0800 |
|---|---|---|
| committer | Alex Vakulenko <avakulenko@google.com> | 2015-12-09 12:35:39 -0800 |
| commit | 9fc597b750e7248fcb89daa5681dbef8b501d02f (patch) | |
| tree | 1c57b6ff05306508f9bb6565273fed4af43fcab3 /metricsd/Android.mk | |
| parent | 85abb0860e4e8b74d8f4498b2b1b3cea44614aff (diff) | |
| download | core-9fc597b750e7248fcb89daa5681dbef8b501d02f.tar.gz core-9fc597b750e7248fcb89daa5681dbef8b501d02f.tar.bz2 core-9fc597b750e7248fcb89daa5681dbef8b501d02f.zip | |
metricsd: Update to use new component/trait APIs from weaved
Removed command and state definitions and use trait definitions
instead. Also, create "metrics" component for weave.
BUG: 25916429, 25916428, 25917426
Change-Id: Icc02d1c46c371d3afa8e4723852f182992c62bf2
Diffstat (limited to 'metricsd/Android.mk')
| -rw-r--r-- | metricsd/Android.mk | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/metricsd/Android.mk b/metricsd/Android.mk index 839ab659e..35537537f 100644 --- a/metricsd/Android.mk +++ b/metricsd/Android.mk @@ -146,9 +146,7 @@ LOCAL_CLANG := true LOCAL_CPP_EXTENSION := $(metrics_cpp_extension) LOCAL_CPPFLAGS := $(metrics_CPPFLAGS) LOCAL_INIT_RC := metrics_collector.rc -LOCAL_REQUIRED_MODULES := \ - metrics.json \ - metrics.schema.json +LOCAL_REQUIRED_MODULES := metrics.json LOCAL_RTTI_FLAG := -frtti LOCAL_SHARED_LIBRARIES := $(metrics_collector_shared_libraries) LOCAL_SRC_FILES := $(metrics_collector_common) \ @@ -207,13 +205,6 @@ include $(BUILD_NATIVE_TEST) include $(CLEAR_VARS) LOCAL_MODULE := metrics.json LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/weaved/commands -LOCAL_SRC_FILES := etc/weaved/commands/$(LOCAL_MODULE) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := metrics.schema.json -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/weaved/states -LOCAL_SRC_FILES := etc/weaved/states/$(LOCAL_MODULE) +LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/weaved/traits +LOCAL_SRC_FILES := etc/weaved/traits/$(LOCAL_MODULE) include $(BUILD_PREBUILT) |