summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert2015-03-27 13:23:07 -0500
committerDan Albert2015-03-27 13:24:04 -0500
commitd0a793dca3c208ab04b67cd7dc0126a3d394d8dd (patch)
tree603590d040d6f6c5dd775fa2955be082343a9350
parent42f1192273f3d05531c3fcfc8ce0fe5c437f6b7f (diff)
downloadplatform-system-core-d0a793dca3c208ab04b67cd7dc0126a3d394d8dd.tar.gz
platform-system-core-d0a793dca3c208ab04b67cd7dc0126a3d394d8dd.tar.xz
platform-system-core-d0a793dca3c208ab04b67cd7dc0126a3d394d8dd.zip
Remove uses of libcxx.mk.
This is a no-op. Change-Id: Iecbcd5f6d818abbf98767a2e996c10f454b652e4
-rw-r--r--libbacktrace/Android.build.mk3
-rw-r--r--libprocessgroup/Android.mk1
-rw-r--r--libsync/tests/Android.mk1
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
76endif 73endif
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
8LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include 8LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
9LOCAL_CFLAGS := -Wall -Werror 9LOCAL_CFLAGS := -Wall -Werror
10LOCAL_REQUIRED_MODULE := processgroup_cleanup 10LOCAL_REQUIRED_MODULE := processgroup_cleanup
11include external/libcxx/libcxx.mk
12include $(BUILD_SHARED_LIBRARY) 11include $(BUILD_SHARED_LIBRARY)
13 12
14include $(CLEAR_VARS) 13include $(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 @@
17LOCAL_PATH:= $(call my-dir) 17LOCAL_PATH:= $(call my-dir)
18 18
19include $(CLEAR_VARS) 19include $(CLEAR_VARS)
20include external/libcxx/libcxx.mk
21LOCAL_CLANG := true 20LOCAL_CLANG := true
22LOCAL_MODULE := sync-unit-tests 21LOCAL_MODULE := sync-unit-tests
23LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk 22LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk