build: Bump C++ standard requirement to C++14 to fix FTBFS with LLVM 10

[mesa.git] / src / gallium / auxiliary / Android.mk

diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk
index acd243b8346ed8ce5eb176b6309616698ac5fb01..a2d5fa60da4db956a0aae04f43ec86b171b2b887 100644 (file)
--- a/src/gallium/auxiliary/Android.mk
+++ b/src/gallium/auxiliary/Android.mk
@@ -32,11 +32,15 @@ LOCAL_SRC_FILES := \
        $(C_SOURCES) \
        $(NIR_SOURCES) \
        $(RENDERONLY_SOURCES) \
-       $(VL_STUB_SOURCES) \
-       util/u_debug_stack_android.cpp
+       $(VL_STUB_SOURCES)
+
+ifeq ($(USE_LIBBACKTRACE),true)
+       LOCAL_SRC_FILES += util/u_debug_stack_android.cpp
+endif
 
 LOCAL_C_INCLUDES := \
-       $(GALLIUM_TOP)/auxiliary/util
+       $(GALLIUM_TOP)/auxiliary/util \
+       $(MESA_TOP)/src/util
 
 ifeq ($(MESA_ENABLE_LLVM),true)
 LOCAL_SRC_FILES += \
@@ -44,7 +48,7 @@ LOCAL_SRC_FILES += \
 $(call mesa-build-with-llvm)
 endif
 
-LOCAL_CPPFLAGS += -std=c++11
+LOCAL_CPPFLAGS += -std=c++14
 
 # We need libmesa_nir to get NIR's generated include directories.
 LOCAL_MODULE := libmesa_gallium