commit 5b3c00d998170d592192f8e77abd0804506a5bea
author android-build-team Robot <android-build-team-robot@google.com> Tue Jul 14 23:05:57 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jul 14 23:05:57 2020 +0000
tree de7f535ffd4c0b162136fee9d9ae13f73d15b0e1
parent 5b84a98a9adc0af250fbbb7eb1c238647e58a3c3
parent fff6169b647b9c5d60350923019e8d60449a3652

Snap for 6680110 from fff6169b647b9c5d60350923019e8d60449a3652 to rvc-qpr1-release

Change-Id: If14ffe8a1cf390be0c7fc88b6a72a30bdce70993

bcinfo/Android.bp

diff --git a/bcinfo/Android.bp b/bcinfo/Android.bp
index af02656..27a10b3 100644
--- a/bcinfo/Android.bp
+++ b/bcinfo/Android.bp
@@ -109,6 +109,8 @@
     name: "libbcinfo-headers",
     vendor_available: true,
     host_supported: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     export_include_dirs: ["include"],
     target: {
         windows: {

bcinfo/Wrap/Android.bp

diff --git a/bcinfo/Wrap/Android.bp b/bcinfo/Wrap/Android.bp
index 7419779..575bdbb 100644
--- a/bcinfo/Wrap/Android.bp
+++ b/bcinfo/Wrap/Android.bp
@@ -18,6 +18,8 @@
     name: "libLLVMWrap",
     vendor_available: true,
     host_supported: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
 
     srcs: [
         "bitcode_wrapperer.cpp",