commit 6e322f696ac5d2a1fdfaece2db39b1b088bdbae9
author Xin Li <delphij@google.com> Mon Nov 13 14:35:29 2017 -0800
committer Xin Li <delphij@google.com> Mon Nov 13 14:35:29 2017 -0800
tree ff9c77a60037cd8b7659559220d57ad9a5f09161
parent 20bdcc1c5c30bb10fae2ceb324fe600f1b34a6bd
parent fb1ebb7e41c0e41aa7a87f32e3557a908f9e8118

Merge commit 'fb1ebb7e41c0e41aa7a87f32e3557a908f9e8118' into HEAD

Change-Id: I0b8409a2da4d4dd1596a449ea96e8d741d8e55dc

lib/SPIRV/Android.bp

diff --git a/lib/SPIRV/Android.bp b/lib/SPIRV/Android.bp
index 2fcad90..846b430 100644
--- a/lib/SPIRV/Android.bp
+++ b/lib/SPIRV/Android.bp
@@ -77,7 +77,7 @@
         },
     },
 
-    shared_libs: ["libLLVM"],
+    shared_libs: ["libLLVM_android"],
 
     cflags: [
         "-D_SPIRV_LLVM_API",

tools/llvm-spirv/Android.bp

diff --git a/tools/llvm-spirv/Android.bp b/tools/llvm-spirv/Android.bp
index b5fae62..2ad2c93 100644
--- a/tools/llvm-spirv/Android.bp
+++ b/tools/llvm-spirv/Android.bp
@@ -39,7 +39,7 @@
     },
 
     shared_libs: [
-        "libLLVM",
+        "libLLVM_android",
         "libSPIRV",
     ],