Merge "split packagemanager_aidl from libbinder_aidl" am: 41c0644cd2 am: ab7e49833f am: be6aa25379

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1653723

Change-Id: I73ecaf383b335c9f45b82ad98149afee0156db1d

1 files changed, 11 insertions, 3 deletions

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 8854ba201c..274c3aebd9 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -130,6 +130,7 @@ cc_library {
         "Status.cpp",
         "TextOutput.cpp",
         "Utils.cpp",
+        ":packagemanager_aidl",
         ":libbinder_aidl",
         ":activity_manager_procstate_aidl",
     ],
@@ -232,9 +233,6 @@ cc_library {
 filegroup {
     name: "libbinder_aidl",
     srcs: [
-        "aidl/android/content/pm/IPackageChangeObserver.aidl",
-        "aidl/android/content/pm/IPackageManagerNative.aidl",
-        "aidl/android/content/pm/PackageChangeEvent.aidl",
         "aidl/android/os/IClientCallback.aidl",
         "aidl/android/os/IServiceCallback.aidl",
         "aidl/android/os/IServiceManager.aidl",
@@ -243,6 +241,16 @@ filegroup {
     path: "aidl",
 }
 
+filegroup {
+    name: "packagemanager_aidl",
+    srcs: [
+        "aidl/android/content/pm/IPackageChangeObserver.aidl",
+        "aidl/android/content/pm/IPackageManagerNative.aidl",
+        "aidl/android/content/pm/PackageChangeEvent.aidl",
+    ],
+    path: "aidl",
+}
+
 aidl_interface {
     name: "libbinder_aidl_test_stub",
     unstable: true,