diff options
| author | Alex Deymo <deymo@google.com> | 2015-12-10 19:53:25 -0800 |
|---|---|---|
| committer | Alex Deymo <deymo@google.com> | 2015-12-10 19:53:25 -0800 |
| commit | 866e2e53338b17e8a3f646c85174437c75ec568f (patch) | |
| tree | 6a8098d340a5d1b3b4795d9e50a8b761c59f79d4 | |
| parent | dc87856e399654209fcaab6732669516009d802c (diff) | |
| download | platform_external_libbrillo-brillo-m8-dev.tar.gz platform_external_libbrillo-brillo-m8-dev.tar.bz2 platform_external_libbrillo-brillo-m8-dev.zip | |
Disable libbrillo-http and libbrillo-stream on mac.brillo-m8-releasebrillo-m8-dev
These libraries don't compile on mac, so we will disable them for now.
Bug: 24619596
TEST=`mmma external/libbrillo` on mac
Change-Id: I4dc408f0b39308404fe2687c53d3deaceb3c5097
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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) |