aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deymo <deymo@google.com>2015-12-10 20:07:12 -0800
committerandroid-build-merger <android-build-merger@google.com>2015-12-10 20:07:12 -0800
commit25b38f301795599ce0e302ee57ef1335cc3abc2e (patch)
tree6a8098d340a5d1b3b4795d9e50a8b761c59f79d4
parent9f05feb8cb1ebea1f6136b338564b8dcb5ff065d (diff)
parent866e2e53338b17e8a3f646c85174437c75ec568f (diff)
downloadplatform_external_libbrillo-25b38f301795599ce0e302ee57ef1335cc3abc2e.tar.gz
platform_external_libbrillo-25b38f301795599ce0e302ee57ef1335cc3abc2e.tar.bz2
platform_external_libbrillo-25b38f301795599ce0e302ee57ef1335cc3abc2e.zip
Disable libbrillo-http and libbrillo-stream on mac.
am: 866e2e5333 * commit '866e2e53338b17e8a3f646c85174437c75ec568f': Disable libbrillo-http and libbrillo-stream on mac.
-rw-r--r--Android.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index ab50d46..1d222cd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -313,7 +313,9 @@ LOCAL_CLANG := true
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
include $(BUILD_HOST_SHARED_LIBRARY)
-# Shared stream library for target
+ifeq ($(HOST_OS),linux)
+
+# Shared stream library for host
# ========================================================
include $(CLEAR_VARS)
LOCAL_CPP_EXTENSION := $(libbrillo_cpp_extension)
@@ -329,7 +331,7 @@ LOCAL_CLANG := true
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
include $(BUILD_HOST_SHARED_LIBRARY)
-# Shared http library for target
+# Shared http library for host
# ========================================================
include $(CLEAR_VARS)
LOCAL_CPP_EXTENSION := $(libbrillo_cpp_extension)
@@ -345,6 +347,8 @@ LOCAL_CLANG := true
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
include $(BUILD_HOST_SHARED_LIBRARY)
+endif # HOST_OS == linux
+
# Unit tests.
# ========================================================
include $(CLEAR_VARS)