Mesa (master): Android: remove remaining explicit libcxx includes
Emil Velikov
evelikov at kemper.freedesktop.org
Thu May 11 12:58:26 UTC 2017
Module: Mesa
Branch: master
Commit: 4eec1cfa8ef250609699c8fc658e8fe58d6fab61
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4eec1cfa8ef250609699c8fc658e8fe58d6fab61
Author: Rob Herring <robh at kernel.org>
Date: Wed May 3 14:35:15 2017 -0500
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 at kernel.org>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
---
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 8be38dd3f4..aa0b1742b6 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 8559b5bce7..ff4c30dabd 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 3b26b592cd..d499d9918d 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 7be3614c03..a2fa623608 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
More information about the mesa-commit
mailing list