Snap for 6680390 from 72db02d933357f3b9c26993edec09c9ea9915e32 to rvc-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-platform-11.0.0_r2android-platform-11.0.0_r1android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r6android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-release

Change-Id: I4983214bfa4fb2c1aa0e0e9dd6a77ea684a433d1

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,