commit c179da962a578365824c9bf948dfec49265a16ad
author Scott James Remnant <keybuk@google.com> Mon Sep 28 22:18:43 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 28 22:18:43 2015 +0000
tree b4212958d7c0d83ce8449cf25f078ebe32d02485
parent c3dccb7a4989907daeea1aac05a7d216499b250f
parent 1a53172fd7ab5be5fb298853a0ea4ae2657dd3b6

am b4f47a30: Merge "metricsd: build on non-Linux hosts"

* commit 'b4f47a30e9706561900060ed7e043d3475779922':
  metricsd: build on non-Linux hosts

metricsd/Android.mk

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