| commit | 1a53172fd7ab5be5fb298853a0ea4ae2657dd3b6 | [log] [tgz] |
|---|---|---|
| author | Scott James Remnant <keybuk@google.com> | Mon Sep 28 22:15:17 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Sep 28 22:15:17 2015 +0000 |
| tree | 8589c663674deaa2c61e51f95c703ad8ba362e53 | |
| parent | 69aa6c3ab211f439aded00304b0f39d6f47b5097 [diff] | |
| parent | daf8d4f4099fe70f09df3ef953309a60637b5e0c [diff] |
Merge "metricsd: build on non-Linux hosts"
diff --git a/metricsd/Android.mk b/metricsd/Android.mk index 33446e9..03b5739 100644 --- a/metricsd/Android.mk +++ b/metricsd/Android.mk
@@ -14,8 +14,6 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(HOST_OS),linux) - metrics_cpp_extension := .cc libmetrics_sources := \ c_metrics_library.cc \ @@ -164,5 +162,3 @@ LOCAL_STATIC_LIBRARIES := libBionicGtestMain libgmock metrics_daemon_protos include $(BUILD_NATIVE_TEST) - -endif # HOST_OS == linux