commit e29744d94df787fa83307572d90a954b1592f69b
author Dan Albert <danalbert@google.com> Fri Mar 27 18:33:41 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 27 18:33:41 2015 +0000
tree 603590d040d6f6c5dd775fa2955be082343a9350
parent 42f1192273f3d05531c3fcfc8ce0fe5c437f6b7f
parent d0a793dca3c208ab04b67cd7dc0126a3d394d8dd

Merge "Remove uses of libcxx.mk."

libbacktrace/Android.build.mk

diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk
index d71c8ec..d7eaa68 100644
--- a/libbacktrace/Android.build.mk
+++ b/libbacktrace/Android.build.mk
@@ -68,9 +68,6 @@
   # Only build if host builds are supported.
   ifeq ($(build_host),true)
     LOCAL_CFLAGS += -Wno-extern-c-compat -fno-omit-frame-pointer
-    ifneq ($($(module)_libc++),)
-      include external/libcxx/libcxx.mk
-    endif
     include $(BUILD_HOST_$(build_target))
   endif
 endif

libprocessgroup/Android.mk

diff --git a/libprocessgroup/Android.mk b/libprocessgroup/Android.mk
index 051999a..ee6ba58 100644
--- a/libprocessgroup/Android.mk
+++ b/libprocessgroup/Android.mk
@@ -8,7 +8,6 @@
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 LOCAL_CFLAGS := -Wall -Werror
 LOCAL_REQUIRED_MODULE := processgroup_cleanup
-include external/libcxx/libcxx.mk
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)

libsync/tests/Android.mk

diff --git a/libsync/tests/Android.mk b/libsync/tests/Android.mk
index ad20e50..9c9562a 100644
--- a/libsync/tests/Android.mk
+++ b/libsync/tests/Android.mk
@@ -17,7 +17,6 @@
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
-include external/libcxx/libcxx.mk
 LOCAL_CLANG := true
 LOCAL_MODULE := sync-unit-tests
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk