commit 2c519442cb6f0a004467169e8b8826b43b06df45
author Linux Build Service Account <lnxbuild@localhost> Thu Sep 03 03:32:42 2020 -0700
committer Linux Build Service Account <lnxbuild@localhost> Thu Sep 03 03:32:42 2020 -0700
tree de7f535ffd4c0b162136fee9d9ae13f73d15b0e1
parent 53e9736ccc14962dd126bfa2b8e156f981a11d66
parent 04bff539a711ca4000f480d2783571c3ab0ade31

Merge 04bff539a711ca4000f480d2783571c3ab0ade31 on remote branch

Change-Id: I1f7906ab76db191748c4ecbe5e3e57cb1e031c5f

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",