Android-x86
Forkexternal/llvm
| Révision | 7d0a0e421b80459b4b56e381e46bd53043b9139c (tree) |
|---|---|
| l'heure | 2017-04-26 11:22:34 |
| Auteur | Mauro Rossi <issor.oruam@gmai...> |
| Commiter | Chih-Wei Huang |
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.
shared_llvm.mk (diff)| @@ -34,10 +34,7 @@ llvm_x86_static_libraries += \ | ||
| 34 | 34 | libLLVMAMDGPUDesc \ |
| 35 | 35 | libLLVMAMDGPUAsmParser \ |
| 36 | 36 | libLLVMAMDGPUAsmPrinter \ |
| 37 | - libLLVMAMDGPUUtils \ | |
| 38 | - libLLVMExecutionEngine \ | |
| 39 | - libLLVMMCJIT \ | |
| 40 | - libLLVMRuntimeDyld | |
| 37 | + libLLVMAMDGPUUtils | |
| 41 | 38 | endif |
| 42 | 39 | |
| 43 | 40 | llvm_mips_static_libraries := \ |
| @@ -86,6 +83,11 @@ llvm_host_static_libraries := \ | ||
| 86 | 83 | libLLVMMCJIT \ |
| 87 | 84 | libLLVMOrcJIT |
| 88 | 85 | |
| 86 | +llvm_device_static_libraries := \ | |
| 87 | + libLLVMExecutionEngine \ | |
| 88 | + libLLVMRuntimeDyld \ | |
| 89 | + libLLVMMCJIT | |
| 90 | + | |
| 89 | 91 | # HOST LLVM shared library build |
| 90 | 92 | include $(CLEAR_VARS) |
| 91 | 93 | LOCAL_IS_HOST_MODULE := true |
| @@ -150,7 +152,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_arm_static_libraries) | ||
| 150 | 152 | LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_aarch64_static_libraries) |
| 151 | 153 | endif |
| 152 | 154 | |
| 153 | -LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_post_static_libraries) | |
| 155 | +LOCAL_WHOLE_STATIC_LIBRARIES += \ | |
| 156 | + $(llvm_device_static_libraries) \ | |
| 157 | + $(llvm_post_static_libraries) | |
| 154 | 158 | |
| 155 | 159 | include $(LLVM_DEVICE_BUILD_MK) |
| 156 | 160 | include $(BUILD_SHARED_LIBRARY) |
