android: gallium/auxiliary: fix building error in Android 7.0
authorMauro Rossi <issor.oruam@gmail.com>
Tue, 10 Jan 2017 00:53:05 +0000 (01:53 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Wed, 18 Jan 2017 16:24:19 +0000 (16:24 +0000)
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 <emil.velikov@collabora.com>
src/gallium/auxiliary/Android.mk

index f5b5a0ccccefea4766f05c4db67a41d15e3f11b8..e8628e43744a8bf7022e6f570c51e586dca5e8c3 100644 (file)
@@ -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