| commit | b4f47a30e9706561900060ed7e043d3475779922 | [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 | e6a7a2cb26bf4d74c98b187284c9d905f5cde773 [diff] | |
| parent | 7c5d693fe94f421e54ca58720e61f1db341dbb16 [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