commit b6d8f55ce1e7b110b37433f4105b4d2623103953
author Xin Li <delphij@google.com> Mon Nov 13 14:35:36 2017 -0800
committer Xin Li <delphij@google.com> Mon Nov 13 14:35:36 2017 -0800
tree f6dec3c39d59b91e99d096a16b7f950dfae55975
parent 494c48686f216793d4c56a98386a2c3f2066f499
parent d149d2008e9a24180c5ae911c2995c6223947829

Merge commit 'd149d2008e9a24180c5ae911c2995c6223947829' into HEAD

Change-Id: Ice5e23225eb67c50428d2a94163295bbcdfd0cbb

bcinfo/Android.bp

diff --git a/bcinfo/Android.bp b/bcinfo/Android.bp
index 7695fba..af02656 100644
--- a/bcinfo/Android.bp
+++ b/bcinfo/Android.bp
@@ -67,10 +67,10 @@
     target: {
         windows: {
             enabled: true,
-            shared_libs: ["libLLVM"],
+            shared_libs: ["libLLVM_android"],
         },
         darwin: {
-            shared_libs: ["libLLVM"],
+            shared_libs: ["libLLVM_android"],
         },
         linux_glibc: {
             allow_undefined_symbols: true,

lib/Android.bp

diff --git a/lib/Android.bp b/lib/Android.bp
index 1534521..962d8bf 100644
--- a/lib/Android.bp
+++ b/lib/Android.bp
@@ -48,10 +48,10 @@
     target: {
         windows: {
             enabled: true,
-            shared_libs: ["libLLVM"],
+            shared_libs: ["libLLVM_android"],
         },
         darwin: {
-            shared_libs: ["libLLVM"],
+            shared_libs: ["libLLVM_android"],
         },
         linux_glibc: {
             static_libs: ["libLLVMLinker"],
@@ -66,7 +66,7 @@
         },
         android: {
             shared_libs: [
-                "libLLVM",
+                "libLLVM_android",
                 "libdl",
                 "liblog",
             ],

tools/bcc/Android.bp

diff --git a/tools/bcc/Android.bp b/tools/bcc/Android.bp
index eecd44d..d26126b 100644
--- a/tools/bcc/Android.bp
+++ b/tools/bcc/Android.bp
@@ -24,7 +24,7 @@
     shared_libs: [
         "libbcc",
         "libbcinfo",
-        "libLLVM",
+        "libLLVM_android",
     ],
 
     header_libs: ["slang_headers"],

tools/bcc_compat/Android.bp

diff --git a/tools/bcc_compat/Android.bp b/tools/bcc_compat/Android.bp
index f6cb4df..2cc54c7 100644
--- a/tools/bcc_compat/Android.bp
+++ b/tools/bcc_compat/Android.bp
@@ -31,7 +31,7 @@
     shared_libs: [
         "libbcc",
         "libbcinfo",
-        "libLLVM",
+        "libLLVM_android",
     ],
 
     header_libs: ["slang_headers"],

tools/bcc_strip_attr/Android.bp

diff --git a/tools/bcc_strip_attr/Android.bp b/tools/bcc_strip_attr/Android.bp
index 59cfe01..b463b2f 100644
--- a/tools/bcc_strip_attr/Android.bp
+++ b/tools/bcc_strip_attr/Android.bp
@@ -21,5 +21,5 @@
     defaults: ["libbcc-defaults"],
 
     srcs: ["bcc_strip_attr.cpp"],
-    shared_libs: ["libLLVM"],
+    shared_libs: ["libLLVM_android"],
 }