commit 4c4c8a863ff6171281d74a55850f00a7abc263bd
author Todd Poynor <toddpoynor@google.com> Wed Jan 06 01:38:34 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 06 01:38:34 2016 +0000
tree 64babc16be1cebd84766b333f26195e25016d56f
parent d04c43169828fe8cd9b50ad7a6ba503f5f91d790
parent 0261ae4bb51483839e0c0ac8a3b54fd715a15275

Merge "metrics_collector: Fix build of tests" am: 89faffc066
am: 0261ae4bb5

* commit '0261ae4bb51483839e0c0ac8a3b54fd715a15275':
  metrics_collector: Fix build of tests

metricsd/Android.mk

diff --git a/metricsd/Android.mk b/metricsd/Android.mk
index 89e4e93..7381703 100644
--- a/metricsd/Android.mk
+++ b/metricsd/Android.mk
@@ -28,6 +28,7 @@
   collectors/cpu_usage_collector.cc \
   collectors/disk_usage_collector.cc \
   metrics_collector.cc \
+  metrics_collector_service_impl.cc \
   persistent_integer.cc
 
 metricsd_common := \
@@ -165,8 +166,7 @@
 LOCAL_REQUIRED_MODULES := metrics.json
 LOCAL_SHARED_LIBRARIES := $(metrics_collector_shared_libraries)
 LOCAL_SRC_FILES := $(metrics_collector_common) \
-  metrics_collector_main.cc \
-  metrics_collector_service_impl.cc
+  metrics_collector_main.cc
 LOCAL_STATIC_LIBRARIES := metricsd_binder_proxy \
   $(metrics_collector_static_libraries)
 include $(BUILD_EXECUTABLE)