summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Khimenko <khim@google.com>2020-06-25 23:24:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-25 23:24:27 +0000
commit71d92fc290b83e3fa4f12a6dc4262986d8610c43 (patch)
tree65f4139c5bffea4fc33de640ad1f4730123869b5
parent58dfc10b0aaf633c54f2aac1ccdf30b8d76519e5 (diff)
parente4aeb9628301abcc5a62693448e6a0d9aa1522c5 (diff)
downloadsdk-71d92fc290b83e3fa4f12a6dc4262986d8610c43.tar.gz
Merge "Make libLLVM_android buildable for native_bridge" into rvc-dev am: e4aeb96283
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/11987780 Change-Id: I021aec5f514af3a874526bcb08c8b2022de4b83c
-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"],