summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPirama Arumuga Nainar <pirama@google.com>2017-08-03 11:38:34 -0700
committerPirama Arumuga Nainar <pirama@google.com>2017-11-06 11:28:53 -0800
commit6d62b9a7de2a01b2111cbc28878e9275b8fd8d32 (patch)
treeff9c77a60037cd8b7659559220d57ad9a5f09161
parentdf754c85256efe467743002f54c4e96b3d54e089 (diff)
downloadspirv-llvm-6d62b9a7de2a01b2111cbc28878e9275b8fd8d32.tar.gz
Make SPIRV depend on libLLVM_android.soandroid-o-mr1-iot-preview-6o-mr1-iot-preview-6
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
-rw-r--r--lib/SPIRV/Android.bp2
-rw-r--r--tools/llvm-spirv/Android.bp2
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",
],