summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Khimenko <khim@google.com>2020-06-25 23:12:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-25 23:12:23 +0000
commite4aeb9628301abcc5a62693448e6a0d9aa1522c5 (patch)
tree65f4139c5bffea4fc33de640ad1f4730123869b5
parentfc320900aa8fd124c3f50b556e64634795aad345 (diff)
parent41a12d391a99974ecf977b9f40348954e01734a9 (diff)
downloadsdk-e4aeb9628301abcc5a62693448e6a0d9aa1522c5.tar.gz
Merge "Make libLLVM_android buildable for native_bridge" into rvc-dev
-rw-r--r--tools/Android.bp10
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/Android.bp b/tools/Android.bp
index 1ac912685..b587409bd 100644
--- a/tools/Android.bp
+++ b/tools/Android.bp
@@ -2,6 +2,11 @@ cc_prebuilt_library_shared {
name: "libLLVM_android",
vendor_available: true,
host_supported: true,
+ // TODO(ccross): this is necessary because the prebuilt module must have
+ // all the variants that are in the source module. Ideally Soong's
+ // arch mutator should handle this.
+ // TODO(b/153609531): remove when no longer needed.
+ native_bridge_supported: true,
target: {
linux_glibc_x86_64: {
srcs: ["linux/lib64/libLLVM_android.so"],
@@ -21,6 +26,11 @@ cc_prebuilt_library_shared {
cc_prebuilt_library_shared {
name: "libclang_android",
host_supported: true,
+ // TODO(ccross): this is necessary because the prebuilt module must have
+ // all the variants that are in the source module. Ideally Soong's
+ // arch mutator should handle this.
+ // TODO(b/153609531): remove when no longer needed.
+ native_bridge_supported: true,
target: {
linux_glibc_x86_64: {
srcs: ["linux/lib64/libclang_android.so"],