diff options
| author | Nicolas Norvez <norvez@google.com> | 2017-06-26 22:11:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-26 22:11:40 +0000 |
| commit | 1d73979cf0ba2cd2e43428f6c4790c1371422b6b (patch) | |
| tree | 69c052540267244adf4a9ca0353a09355506d03e | |
| parent | 18037ac1393de9ce5bb6c9047beacd799742a0aa (diff) | |
| parent | 4be46be61fe3f19af7cdf19f3d5f0738772102bd (diff) | |
| download | llvm-1d73979cf0ba2cd2e43428f6c4790c1371422b6b.tar.gz | |
Merge "libLLVM: Add ExecutionEngine and JIT for CrOS llvmpipe" am: 39ca5a2e95 am: aa2d65dc68
am: 4be46be61f
Change-Id: Idbc7261c43d7a55289fb13fb25f80e979a54f757
| -rw-r--r-- | Android.bp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp index f7d7b030d3d9..e3d13978b16a 100644 --- a/Android.bp +++ b/Android.bp @@ -238,6 +238,10 @@ cc_library_shared { "libLLVMProfileData", "libLLVMProfileDataCoverage", "libLLVMLibDriver", + "libLLVMExecutionEngine", + "libLLVMRuntimeDyld", + "libLLVMMCJIT", + "libLLVMOrcJIT", ], export_include_dirs: ["include"], @@ -245,12 +249,7 @@ cc_library_shared { 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, |