commit dd9c14e9dd9edcaac8051955c2e5a254dc201bfc
author Treehugger Robot <treehugger-gerrit@google.com> Sat Feb 06 03:20:47 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 06 03:20:47 2021 +0000
tree 812479acdd684e1205e29cc39e31d27c119ecf16
parent 6b9a50419a474d062630a0d1175a50cd35306ce4
parent 5f6a89a232ded2f1025433fa632f19b893bd7d0a

Merge "Set apex_available of libbinder_headers"

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 {