diff options
author | Sami Tolvanen <samitolvanen@google.com> | 2015-09-28 15:54:42 +0100 |
---|---|---|
committer | Sami Tolvanen <samitolvanen@google.com> | 2015-09-28 15:59:37 +0100 |
commit | 48d7450fce51ceb6a1107685bd428774d985bcd0 (patch) | |
tree | 3e754e2073a5d364067221cd70de5c2b733a9c4e /libfec | |
parent | 13f25b1b7f337802d3d1ad9d4e57f25737a18045 (diff) | |
download | extras-48d7450fce51ceb6a1107685bd428774d985bcd0.tar.gz |
libfec: fix Mac build
Exclude the host library and executables on Mac.
Change-Id: Ie399b83f3678d16aac67ce9a4414344a93f90055
Diffstat (limited to 'libfec')
-rw-r--r-- | libfec/Android.mk | 4 | ||||
-rw-r--r-- | libfec/test/Android.mk | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libfec/Android.mk b/libfec/Android.mk index cccf6c06..4ca563e4 100644 --- a/libfec/Android.mk +++ b/libfec/Android.mk @@ -38,6 +38,8 @@ LOCAL_STATIC_LIBRARIES := \ $(common_static_libraries) include $(BUILD_STATIC_LIBRARY) +ifeq ($(HOST_OS),linux) + include $(CLEAR_VARS) LOCAL_CFLAGS := $(common_cflags) -D_GNU_SOURCE -DFEC_NO_KLOG LOCAL_C_INCLUDES := $(common_c_includes) @@ -53,4 +55,6 @@ LOCAL_STATIC_LIBRARIES := \ $(common_static_libraries) include $(BUILD_HOST_STATIC_LIBRARY) +endif # HOST_OS == linux + include $(LOCAL_PATH)/test/Android.mk diff --git a/libfec/test/Android.mk b/libfec/test/Android.mk index 4b38310f..a2bba554 100644 --- a/libfec/test/Android.mk +++ b/libfec/test/Android.mk @@ -1,5 +1,7 @@ LOCAL_PATH:= $(call my-dir) +ifeq ($(HOST_OS),linux) + include $(CLEAR_VARS) LOCAL_CLANG := true LOCAL_SANITIZE := integer @@ -26,3 +28,5 @@ LOCAL_STATIC_LIBRARIES := libfec_rs_host LOCAL_CFLAGS := -Wall -Werror -D_GNU_SOURCE LOCAL_C_INCLUDES += external/fec include $(BUILD_HOST_EXECUTABLE) + +endif # HOST_OS == linux |