Skip to content

Commit c82ca9f

Browse files
samitolvanenGerrit Code Review
authored and
Gerrit Code Review
committed
Merge "libfec: fix Mac build"
2 parents 13f25b1 + 48d7450 commit c82ca9f

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

libfec/Android.mk

+4
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ LOCAL_STATIC_LIBRARIES := \
3838
$(common_static_libraries)
3939
include $(BUILD_STATIC_LIBRARY)
4040

41+
ifeq ($(HOST_OS),linux)
42+
4143
include $(CLEAR_VARS)
4244
LOCAL_CFLAGS := $(common_cflags) -D_GNU_SOURCE -DFEC_NO_KLOG
4345
LOCAL_C_INCLUDES := $(common_c_includes)
@@ -53,4 +55,6 @@ LOCAL_STATIC_LIBRARIES := \
5355
$(common_static_libraries)
5456
include $(BUILD_HOST_STATIC_LIBRARY)
5557

58+
endif # HOST_OS == linux
59+
5660
include $(LOCAL_PATH)/test/Android.mk

libfec/test/Android.mk

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
LOCAL_PATH:= $(call my-dir)
22

3+
ifeq ($(HOST_OS),linux)
4+
35
include $(CLEAR_VARS)
46
LOCAL_CLANG := true
57
LOCAL_SANITIZE := integer
@@ -26,3 +28,5 @@ LOCAL_STATIC_LIBRARIES := libfec_rs_host
2628
LOCAL_CFLAGS := -Wall -Werror -D_GNU_SOURCE
2729
LOCAL_C_INCLUDES += external/fec
2830
include $(BUILD_HOST_EXECUTABLE)
31+
32+
endif # HOST_OS == linux

0 commit comments

Comments
 (0)