nir: Embed the shader_info in the nir_shader again

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

diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk
index f5b5a0ccccefea4766f05c4db67a41d15e3f11b8..4f6f71bbf6a9aead26606cc66ba813be87f46f2f 100644 (file)
--- 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
 
@@ -48,6 +48,8 @@ endif
 LOCAL_MODULE := libmesa_gallium
 LOCAL_STATIC_LIBRARIES += libmesa_nir
 
+LOCAL_WHOLE_STATIC_LIBRARIES += cpufeatures
+
 # generate sources
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 intermediates := $(call local-generated-sources-dir)