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>
This commit is contained in:
parent
f21454eaa5
commit
4eec1cfa8e
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue