libbinder: prepare extradition of pm AIDLs

The package manager AIDL files were added here, but they don't need to
be here, so moving them out of the other variants of this library and
into the queue for processing. For what crime you ask? Memory usage.

Bug: 183654927
Test: N/A
Change-Id: I084d02d8ad9b606fd813765f896c272a59f3058f

1 files changed, 5 insertions, 3 deletions

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 31227aba48..f157aa27b2 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -64,6 +64,9 @@ libbinder_device_interface_sources = [
     "PermissionCache.cpp",
     "PermissionController.cpp",
 ]
+libbinder_no_vendor_interface_sources = [
+    ":packagemanager_aidl",
+]
 
 cc_library {
     name: "libbinder",
@@ -123,9 +126,8 @@ cc_library {
         "Status.cpp",
         "TextOutput.cpp",
         "Utils.cpp",
-        ":packagemanager_aidl",
         ":libbinder_aidl",
-    ],
+    ] + libbinder_no_vendor_interface_sources,
 
     target: {
         android: {
@@ -137,7 +139,7 @@ cc_library {
             },
         },
         vendor: {
-            exclude_srcs: libbinder_device_interface_sources,
+            exclude_srcs: libbinder_device_interface_sources + libbinder_no_vendor_interface_sources,
         },
         darwin: {
             enabled: false,