commit c4f9f56cdb52f4305ebfa5b9943d99100a39643e
author Paul Duffin <paulduffin@google.com> Wed Apr 01 09:39:38 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 01 09:39:38 2020 +0000
tree f6cd8bc9b2b90e95f8f6248c6641475c188697be
parent 1b8e35710d083115b8113e85234bd99bf5b0d4e0
parent 96a0976499ea0c24f1fff77f4598d462409af692

Merge "Add some missing apexes to apex_available" am: 4a24272a84 am: b6ddfa83b4 am: 9e57782400 am: c05d2c481b am: 96a0976499

Change-Id: I1b1bac8de9f140387fd3d19bea4fddcea2afb860

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index e6cfeb4..bc241bf 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -73,9 +73,9 @@
     // or dessert updates. Instead, apex users should use libbinder_ndk.
     apex_available: [
         "//apex_available:platform",
-        // TODO(b/139016109) remove these three
+        // TODO(b/139016109) remove these
+        "com.android.media",
         "com.android.media.swcodec",
-        "test_com.android.media.swcodec",
     ],
 
     srcs: [

libs/binderthreadstate/Android.bp

diff --git a/libs/binderthreadstate/Android.bp b/libs/binderthreadstate/Android.bp
index c186110..9e50729 100644
--- a/libs/binderthreadstate/Android.bp
+++ b/libs/binderthreadstate/Android.bp
@@ -20,6 +20,10 @@
     vendor_available: true,
     host_supported: true,
 
+    apex_available: [
+        "com.android.media",
+    ],
+
     shared_libs: [
         "libbinder",
         "libhidlbase",  // libhwbinder is in here

libs/gui/sysprop/Android.bp

diff --git a/libs/gui/sysprop/Android.bp b/libs/gui/sysprop/Android.bp
index e7f7c1f..e090c49 100644
--- a/libs/gui/sysprop/Android.bp
+++ b/libs/gui/sysprop/Android.bp
@@ -1,5 +1,9 @@
 sysprop_library {
     name: "LibGuiProperties",
+    apex_available: [
+        "com.android.media",
+        "com.android.media.swcodec",
+    ],
     srcs: ["*.sysprop"],
     api_packages: ["android.sysprop"],
     property_owner: "Platform",