Merge "Revert "Make libbinder not available to media.swcodec apex"" into rvc-dev
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 2832bc9..db4aba8 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -74,6 +74,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: [