commit e70d8fbc8d33484f4909083d0a3e17c868935f59
author Steven Moreland <smoreland@google.com> Thu Aug 20 00:15:14 2020 +0000
committer Steven Moreland <smoreland@google.com> Thu Aug 20 00:15:14 2020 +0000
tree dfe4c9f9305d5e584db0853fe7ff273c107ff350
parent 8852cc78a0f0c02caf61f21cb3c520583025ea69

Revert "libbinder: disallow APEX at build time"

Build breakage.

This reverts commit 8852cc78a0f0c02caf61f21cb3c520583025ea69.

Bug: 161926892
Reason for revert: b/165698873 - broken build

Change-Id: I4708d5e5aaba655b3399bf59ba342f303af7a8ff

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 8bc26e8..861b589 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -78,6 +78,9 @@
     // or dessert updates. Instead, apex users should use libbinder_ndk.
     apex_available: [
         "//apex_available:platform",
+        // TODO(b/139016109) remove these three
+        "com.android.media.swcodec",
+        "test_com.android.media.swcodec",
     ],
 
     srcs: [
@@ -124,6 +127,10 @@
         export_aidl_headers: true,
     },
 
+    // TODO(b/142684679): for com.android.media which is compiled
+    // as vendor and used as system code.
+    use_apex_name_macro: true,
+
     cflags: [
         "-Wall",
         "-Wextra",