commit 6d62b9a7de2a01b2111cbc28878e9275b8fd8d32
author Pirama Arumuga Nainar <pirama@google.com> Thu Aug 03 11:38:34 2017 -0700
committer Pirama Arumuga Nainar <pirama@google.com> Mon Nov 06 11:28:53 2017 -0800
tree ff9c77a60037cd8b7659559220d57ad9a5f09161
parent df754c85256efe467743002f54c4e96b3d54e089

Make SPIRV depend on libLLVM_android.so

Bug: http://b/64121881

The module built in the Android tree is now named libLLVM_android.so.

Test: aosp_marlin checkbuild with FORCE_BUILD_LLVM_COMPONENTS set and
unset.

Change-Id: I1175f6d4ecd1eb8f80f904f3d48bbf63a87d233a

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",
     ],