summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBertrand SIMONNET2015-08-11 13:45:05 -0500
committerBertrand SIMONNET2015-08-11 13:45:05 -0500
commit0a94a3bf1cd2accfa9ff60e6b29150eea0a7c835 (patch)
treec4e8d4f6065f614a47c679998eda27181d559512
parent3670eab0ba12471b8eddb894679cac824779dcb1 (diff)
downloadplatform-system-core-0a94a3bf1cd2accfa9ff60e6b29150eea0a7c835.tar.gz
platform-system-core-0a94a3bf1cd2accfa9ff60e6b29150eea0a7c835.tar.xz
platform-system-core-0a94a3bf1cd2accfa9ff60e6b29150eea0a7c835.zip
metricsd: Only define the targets on linux.
libchromeos (dependency of metricsd) is only defined for linux. All metrics target must only be defined on mac too or the build system will complain. BUG: 22879597 Change-Id: I5bee816e001518a8053d1dfc7b39cca81a4314fd
-rw-r--r--metricsd/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/metricsd/Android.mk b/metricsd/Android.mk
index 17fb27848..9edba6eba 100644
--- a/metricsd/Android.mk
+++ b/metricsd/Android.mk
@@ -14,6 +14,8 @@
14 14
15LOCAL_PATH := $(call my-dir) 15LOCAL_PATH := $(call my-dir)
16 16
17ifeq ($(HOST_OS),linux)
18
17metrics_cpp_extension := .cc 19metrics_cpp_extension := .cc
18libmetrics_sources := \ 20libmetrics_sources := \
19 c_metrics_library.cc \ 21 c_metrics_library.cc \
@@ -110,3 +112,5 @@ LOCAL_SHARED_LIBRARIES := $(metrics_shared_libraries) \
110LOCAL_SRC_FILES := $(metrics_daemon_sources) 112LOCAL_SRC_FILES := $(metrics_daemon_sources)
111LOCAL_STATIC_LIBRARIES := metrics_daemon_protos 113LOCAL_STATIC_LIBRARIES := metrics_daemon_protos
112include $(BUILD_EXECUTABLE) 114include $(BUILD_EXECUTABLE)
115
116endif # HOST_OS == linux