From d0a793dca3c208ab04b67cd7dc0126a3d394d8dd Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 27 Mar 2015 11:23:07 -0700 Subject: [PATCH] Remove uses of libcxx.mk. This is a no-op. Change-Id: Iecbcd5f6d818abbf98767a2e996c10f454b652e4 --- libbacktrace/Android.build.mk | 3 --- libprocessgroup/Android.mk | 1 - libsync/tests/Android.mk | 1 - 3 files changed, 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) # 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 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 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) 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 @@ 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