From 02185a1c9b4cb25a197d65d2a724eb7d26b5d691 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Tue, 10 Jan 2017 01:53:05 +0100 Subject: [PATCH] android: gallium/auxiliary: fix building error in Android 7.0 Conditional libLLVMCore static library dependency is added, for the case when MESA_ENABLE_LLVM is true Fixes the following building error with Android 7.0: In file included from external/mesa/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp:62: ... external/llvm/include/llvm/IR/Attributes.h:68:14: fatal error: 'llvm/IR/Attributes.inc' file not found #include "llvm/IR/Attributes.inc" ^ 1 error generated. Reviewed-by: Emil Velikov --- src/gallium/auxiliary/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk index f5b5a0cccce..e8628e43744 100644 --- a/src/gallium/auxiliary/Android.mk +++ b/src/gallium/auxiliary/Android.mk @@ -40,7 +40,7 @@ ifeq ($(MESA_ENABLE_LLVM),true) LOCAL_SRC_FILES += \ $(GALLIVM_SOURCES) \ $(GALLIVM_CPP_SOURCES) - +LOCAL_STATIC_LIBRARIES += libLLVMCore LOCAL_CPPFLAGS := -std=c++11 endif -- 2.30.2