commit 4efc619e4a458940776300b32cb2a00ef0cd9f86
author Victor Khimenko <khim@google.com> Tue Jul 07 11:52:39 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 07 11:52:39 2020 +0000
tree 0f1ffbcb68f39b1d78217aeda084bdcdac11ec10
parent cf29a074ac3cce0e3b872de95182e824d019edbf
parent a3cd97ae43e6f458e159f594c1d1808242734f2a

Merge "Make libbinder buildable for native_bridge" am: cb64d4e371 am: a3cd97ae43

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1354903

Change-Id: I2eb1d47edfb850fe800ded8b97a885af97c4e4fd

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index db4aba8..b24a577 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -17,6 +17,8 @@
     export_include_dirs: ["include"],
     vendor_available: true,
     host_supported: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
 
     header_libs: [
         "libbase_headers",
@@ -62,6 +64,8 @@
     },
     double_loadable: true,
     host_supported: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
 
     // TODO(b/31559095): get headers from bionic on host
     include_dirs: [