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

* commit 'b4f47a30e9706561900060ed7e043d3475779922':
  metricsd: build on non-Linux hosts
This commit is contained in:
Scott James Remnant 2015-09-28 22:18:43 +00:00 committed by Android Git Automerger
commit 14e61ffeb8

View file

@ -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_SRC_FILES := $(metrics_tests_sources)
LOCAL_STATIC_LIBRARIES := libBionicGtestMain libgmock metrics_daemon_protos
include $(BUILD_NATIVE_TEST)
endif # HOST_OS == linux