diff options
-rw-r--r-- | libbacktrace/Android.build.mk | 3 | ||||
-rw-r--r-- | libprocessgroup/Android.mk | 1 | ||||
-rw-r--r-- | libsync/tests/Android.mk | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk index d71c8ec22..d7eaa6811 100644 --- a/libbacktrace/Android.build.mk +++ b/libbacktrace/Android.build.mk | |||
@@ -68,9 +68,6 @@ ifeq ($(build_type),host) | |||
68 | # Only build if host builds are supported. | 68 | # Only build if host builds are supported. |
69 | ifeq ($(build_host),true) | 69 | ifeq ($(build_host),true) |
70 | LOCAL_CFLAGS += -Wno-extern-c-compat -fno-omit-frame-pointer | 70 | LOCAL_CFLAGS += -Wno-extern-c-compat -fno-omit-frame-pointer |
71 | ifneq ($($(module)_libc++),) | ||
72 | include external/libcxx/libcxx.mk | ||
73 | endif | ||
74 | include $(BUILD_HOST_$(build_target)) | 71 | include $(BUILD_HOST_$(build_target)) |
75 | endif | 72 | endif |
76 | endif | 73 | endif |
diff --git a/libprocessgroup/Android.mk b/libprocessgroup/Android.mk index 051999adc..ee6ba5868 100644 --- a/libprocessgroup/Android.mk +++ b/libprocessgroup/Android.mk | |||
@@ -8,7 +8,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include | |||
8 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include | 8 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include |
9 | LOCAL_CFLAGS := -Wall -Werror | 9 | LOCAL_CFLAGS := -Wall -Werror |
10 | LOCAL_REQUIRED_MODULE := processgroup_cleanup | 10 | LOCAL_REQUIRED_MODULE := processgroup_cleanup |
11 | include external/libcxx/libcxx.mk | ||
12 | include $(BUILD_SHARED_LIBRARY) | 11 | include $(BUILD_SHARED_LIBRARY) |
13 | 12 | ||
14 | include $(CLEAR_VARS) | 13 | include $(CLEAR_VARS) |
diff --git a/libsync/tests/Android.mk b/libsync/tests/Android.mk index ad20e50a1..9c9562a1f 100644 --- a/libsync/tests/Android.mk +++ b/libsync/tests/Android.mk | |||
@@ -17,7 +17,6 @@ | |||
17 | LOCAL_PATH:= $(call my-dir) | 17 | LOCAL_PATH:= $(call my-dir) |
18 | 18 | ||
19 | include $(CLEAR_VARS) | 19 | include $(CLEAR_VARS) |
20 | include external/libcxx/libcxx.mk | ||
21 | LOCAL_CLANG := true | 20 | LOCAL_CLANG := true |
22 | LOCAL_MODULE := sync-unit-tests | 21 | LOCAL_MODULE := sync-unit-tests |
23 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk | 22 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk |