android: enable swrast w/o radeonsi build

There has been a cross dependency between swrast and radeonsi builds,
as gallium/auxiliary requires that libLLVM provides the symbols in
libLLVMExecutionEngine, libLLVMRuntimeDyld and libLLVMMCJIT

In order to avoid having to enable radeonsi to properly build swast,
libLLVMExecutionEngine, libLLVMRuntimeDyld and libLLVMMCJIT
are added to device libLLVM as whole static dependecies.

For simplification these common dependencies are set as unconditional
and llvm_device_static_libraries is used to keep existing code style.

libAMDGPU* dependencies are now defined as strictly radeonsi conditional.

diff --git a/shared_llvm.mk b/shared_llvm.mk
index b153b98..c82f389 100644 (file)
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -34,10 +34,7 @@ llvm_x86_static_libraries += \
   libLLVMAMDGPUDesc \
   libLLVMAMDGPUAsmParser \
   libLLVMAMDGPUAsmPrinter \
-  libLLVMAMDGPUUtils \
-  libLLVMExecutionEngine \
-  libLLVMMCJIT \
-  libLLVMRuntimeDyld
+  libLLVMAMDGPUUtils
 endif
 
 llvm_mips_static_libraries := \
@@ -86,6 +83,11 @@ llvm_host_static_libraries := \
   libLLVMMCJIT \
   libLLVMOrcJIT
 
+llvm_device_static_libraries := \
+  libLLVMExecutionEngine \
+  libLLVMRuntimeDyld \
+  libLLVMMCJIT
+
 # HOST LLVM shared library build
 include $(CLEAR_VARS)
 LOCAL_IS_HOST_MODULE := true
@@ -150,7 +152,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_arm_static_libraries)
 LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_aarch64_static_libraries)
 endif
 
-LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_post_static_libraries)
+LOCAL_WHOLE_STATIC_LIBRARIES += \
+  $(llvm_device_static_libraries) \
+  $(llvm_post_static_libraries)
 
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_SHARED_LIBRARY)