Android: remove remaining explicit libcxx includes

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@kernel.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index 8be38dd3f4143d3c3050b53a1c246fd1fb6fd138..aa0b1742b6be498e25c2bc92dfd39162775a343a 100644 (file)
--- 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 8559b5bce794d95ce789a29edc80c3ff232a92c6..ff4c30dabd6e645db9c0659a902fadaf9fb3326c 100644 (file)
--- 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 3b26b592cdd61c450db939cd5bb02ed7d97cf245..d499d9918d86c2c836ebe3340ee2f48cb47271ae 100644 (file)
--- 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 7be3614c03ebe8e3a29cb046fb7999bc6f17d545..a2fa62360880316d7115d6158d2f53edfb553165 100644 (file)
--- 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