commit 2f7b6787ee8228cab4cad2d227109f706d2eace3
author Victor Khimenko <khim@google.com> Tue Jul 14 17:27:05 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 14 17:27:05 2020 +0000
tree de7f535ffd4c0b162136fee9d9ae13f73d15b0e1
parent 5b84a98a9adc0af250fbbb7eb1c238647e58a3c3
parent a9ef3596eda5d3e016f024f778446a9b33657856

Make libbcinfo buildable for native_bridge am: a9ef3596ed

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/compile/libbcc/+/12128163

Change-Id: Ie6387f5ba850c7365abbed343319b151806885e0

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