commit 8cdd9f59ffb6bae793e50c7cfdb23e9eac0703c7
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 30 21:09:12 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 30 21:09:12 2017 +0000
tree bb3581fd21c2a064fa002b2b2e28b971d757bdc9
parent 39ca5a2e95704a9df57c0ee33a6b06f625acd7d7
parent 92b9f9b6912208f22554e87515abf72e4abd5c65

Merge "Refactor module registration"

Android.bp

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,