libLLVM: Add ExecutionEngine and JIT for CrOS llvmpipe
Porting ag/1716203 to AOSP.
Chrome OS uses software rendering for Android graphics when running in a
VM, specifically Mesa's llvmpipe driver.
llvmpipe needs ExecutionEngine, MCJIT, OrcJIT and RuntimeDyld components
to be added to the LLVM runtime libLLVM.so.
This CL adds the necessary components. It increases the size of
libLLVM.so by ~360KB, from 18.9MB to 19.2MB for dragon.
Bug: 62387593
Test: mmm external/llvm. Check that libLLVMMCJIT.a, libLLVMOrcJIT.a,
libLLVMExecutionEngine.a and libLLVMRuntimeDyld.a intermediates are
built and included in libLLVM.so by spot-checking symbols.
Change-Id: I5c54535f0768daced221514582c550be1f3a8e89
diff --git a/Android.bp b/Android.bp
index f7d7b03..e3d1397 100644
--- a/Android.bp
+++ b/Android.bp
@@ -238,6 +238,10 @@
"libLLVMProfileData",
"libLLVMProfileDataCoverage",
"libLLVMLibDriver",
+ "libLLVMExecutionEngine",
+ "libLLVMRuntimeDyld",
+ "libLLVMMCJIT",
+ "libLLVMOrcJIT",
],
export_include_dirs: ["include"],
@@ -245,12 +249,7 @@
target: {
host: {
// Host build pulls in all ARM, Mips, X86 components.
- whole_static_libs: [
- "libLLVMExecutionEngine",
- "libLLVMRuntimeDyld",
- "libLLVMMCJIT",
- "libLLVMOrcJIT",
- ] + llvm_arm_static_libraries +
+ whole_static_libs: llvm_arm_static_libraries +
llvm_aarch64_static_libraries +
llvm_mips_static_libraries +
llvm_x86_static_libraries,
