commit 5f6a89a232ded2f1025433fa632f19b893bd7d0a
author Jooyung Han <jooyung@google.com> Fri Feb 05 15:28:58 2021 +0900
committer Jooyung Han <jooyung@google.com> Fri Feb 05 16:36:36 2021 +0900
tree abf81fe556d0a2da5bf9e43c7a0d62c6fd2d471e
parent c183b7c68451c7901f3ace05f63e20011ca188bc

Set apex_available of libbinder_headers

libbinder_headers was available to the APEXes via the hand-written
allowlist in build/soong/apex/apex.go. Trying to remove the allowlist by
adding apex_available property to libbinder_headers.

Bug: 150999716
Test: m
Change-Id: I9f1c6ec20d1c665ff148b3b78b7e01eebde5a229

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 11b032b..7901f45 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -32,6 +32,11 @@
         "libcutils_headers",
         "libutils_headers",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.media",
+        "com.android.media.swcodec",
+    ],
     min_sdk_version: "29",
     target: {
         darwin: {

libs/binder/ndk/Android.bp

diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp
index d76a1f9..897c72a 100644
--- a/libs/binder/ndk/Android.bp
+++ b/libs/binder/ndk/Android.bp
@@ -141,14 +141,12 @@
             enabled: false,
         },
     },
-    min_sdk_version: "29",
     apex_available: [
         "//apex_available:platform",
-        // TODO(b/166468760) remove these three
         "com.android.media",
         "com.android.media.swcodec",
-        "test_com.android.media.swcodec",
     ],
+    min_sdk_version: "29",
 }
 
 ndk_headers {