From 6d62b9a7de2a01b2111cbc28878e9275b8fd8d32 Mon Sep 17 00:00:00 2001
From: Pirama Arumuga Nainar <pirama@google.com>
Date: Thu, 3 Aug 2017 11:38:34 -0700
Subject: 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        | 2 +-
 tools/llvm-spirv/Android.bp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/SPIRV/Android.bp b/lib/SPIRV/Android.bp
index 2fcad901..846b4303 100644
--- a/lib/SPIRV/Android.bp
+++ b/lib/SPIRV/Android.bp
@@ -77,7 +77,7 @@ cc_library_shared {
         },
     },
 
-    shared_libs: ["libLLVM"],
+    shared_libs: ["libLLVM_android"],
 
     cflags: [
         "-D_SPIRV_LLVM_API",
diff --git a/tools/llvm-spirv/Android.bp b/tools/llvm-spirv/Android.bp
index b5fae62f..2ad2c936 100644
--- a/tools/llvm-spirv/Android.bp
+++ b/tools/llvm-spirv/Android.bp
@@ -39,7 +39,7 @@ cc_binary {
     },
 
     shared_libs: [
-        "libLLVM",
+        "libLLVM_android",
         "libSPIRV",
     ],
 
-- 
cgit v1.2.3