Make libbcinfo buildable for native_bridge am: 72db02d933 am: 8dfc67cdfcandroid-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r30android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-c-releaseandroid11-d2-release

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/llvm/+/12128188

Change-Id: Ief2ddf424f95524ef05c987635fff8ca4508b56a

5 files changed, 14 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index b1ee9cc62069..432340a9e92d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,6 +18,8 @@ llvm_defaults {
     name: "llvm-defaults-no-generated-headers",
 
     host_supported: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
 
     cflags: [
         "-D_GNU_SOURCE",
@@ -104,6 +106,8 @@ cc_library_headers {
     name: "llvm-headers-no-generated-headers",
     vendor_available: true,
     host_supported: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     export_include_dirs: ["include"],
     target: {
         android: {
@@ -125,6 +129,8 @@ cc_library_headers {
     name: "llvm-headers",
     vendor_available: true,
     host_supported: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     header_libs: ["llvm-headers-no-generated-headers"],
     export_header_lib_headers: ["llvm-headers-no-generated-headers"],
     generated_headers: [
diff --git a/lib/Target/AArch64/Android.bp b/lib/Target/AArch64/Android.bp
index 6f23095a2cfa..43110d29a9bc 100644
--- a/lib/Target/AArch64/Android.bp
+++ b/lib/Target/AArch64/Android.bp
@@ -24,6 +24,8 @@ cc_library_static {
     name: "llvm-aarch64-headers",
     vendor_available: true,
     host_supported: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     target: {
         windows: {
             enabled: true,
diff --git a/lib/Target/ARM/Android.bp b/lib/Target/ARM/Android.bp
index 9f7f0db8c157..b54d89898d4f 100644
--- a/lib/Target/ARM/Android.bp
+++ b/lib/Target/ARM/Android.bp
@@ -23,6 +23,8 @@ cc_library_static {
     name: "llvm-arm-headers",
     vendor_available: true,
     host_supported: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     target: {
         windows: {
             enabled: true,
diff --git a/lib/Target/Mips/Android.bp b/lib/Target/Mips/Android.bp
index 8e1a99d55e6f..f8c1abffd912 100644
--- a/lib/Target/Mips/Android.bp
+++ b/lib/Target/Mips/Android.bp
@@ -17,6 +17,8 @@ cc_library_static {
     name: "llvm-mips-headers",
     vendor_available: true,
     host_supported: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     target: {
         windows: {
             enabled: true,
diff --git a/lib/Target/X86/Android.bp b/lib/Target/X86/Android.bp
index efcbc079828a..4e1b3f423cb9 100644
--- a/lib/Target/X86/Android.bp
+++ b/lib/Target/X86/Android.bp
@@ -24,6 +24,8 @@ cc_library_static {
     name: "llvm-x86-headers",
     vendor_available: true,
     host_supported: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     target: {
         windows: {
             enabled: true,