[Mesa-dev] [PATCH v2 03/14] Android: remove remaining explicit libcxx includes

[Rob Herring]

Explicitly including libcxx includes is not necessary at least on
Android M and later. It appears that libc++ was made the default in
commit "Make libc++ the default STL." in Android build system post L.
However, if L support is still needed, using "LOCAL_CXX_STL=libc++" is
the preferred way.

Signed-off-by: Rob Herring <robh at kernel.org>
---
 src/amd/Android.common.mk              | 1 -
 src/gallium/Android.common.mk          | 1 -
 src/gallium/drivers/nouveau/Android.mk | 1 -
 src/gallium/drivers/r600/Android.mk    | 3 +--
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index 8be38dd3f414..aa0b1742b6be 100644
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -56,7 +56,6 @@ LOCAL_C_INCLUDES := \
 	$(intermediates)/common \
 	external/llvm/include \
 	external/llvm/device/include \
-	external/libcxx/include \
 	$(ELF_INCLUDES)
 
 LOCAL_STATIC_LIBRARIES := libLLVMCore
diff --git a/src/gallium/Android.common.mk b/src/gallium/Android.common.mk
index 8559b5bce794..ff4c30dabd6e 100644
--- a/src/gallium/Android.common.mk
+++ b/src/gallium/Android.common.mk
@@ -33,7 +33,6 @@ ifeq ($(MESA_ENABLE_LLVM),true)
 LOCAL_C_INCLUDES += \
 	external/llvm/include \
 	external/llvm/device/include \
-	external/libcxx/include \
 	$(ELF_INCLUDES)
 endif
 
diff --git a/src/gallium/drivers/nouveau/Android.mk b/src/gallium/drivers/nouveau/Android.mk
index 3b26b592cdd6..d499d9918d86 100644
--- a/src/gallium/drivers/nouveau/Android.mk
+++ b/src/gallium/drivers/nouveau/Android.mk
@@ -39,6 +39,5 @@ LOCAL_SRC_FILES := \
 LOCAL_SHARED_LIBRARIES := libdrm_nouveau
 LOCAL_MODULE := libmesa_pipe_nouveau
 
-LOCAL_C_INCLUDES := external/libcxx/include
 include $(GALLIUM_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk
index 7be3614c03eb..a2fa62360880 100644
--- a/src/gallium/drivers/r600/Android.mk
+++ b/src/gallium/drivers/r600/Android.mk
@@ -30,8 +30,7 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES)
 
-LOCAL_C_INCLUDES := $(MESA_TOP)/src/amd/common \
-	external/libcxx/include
+LOCAL_C_INCLUDES := $(MESA_TOP)/src/amd/common
 
 LOCAL_STATIC_LIBRARIES := libmesa_amd_common
 LOCAL_SHARED_LIBRARIES := libdrm_radeon
-- 
2.11.0