commit 20a84b03093405c75d64cd0f0d813f415d746ef3
author Steven Moreland <smoreland@google.com> Mon Mar 29 19:14:11 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 29 19:14:11 2021 +0000
tree 2474d209434699b1f3424751b3d1952fa1fd614c
parent 17435d200c45336bca4578b5e02538d2d228aedf
parent be6aa25379af91f18eea09ee43d23ae8aeeb3762

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

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 8854ba2..274c3ae 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -130,6 +130,7 @@
         "Status.cpp",
         "TextOutput.cpp",
         "Utils.cpp",
+        ":packagemanager_aidl",
         ":libbinder_aidl",
         ":activity_manager_procstate_aidl",
     ],
@@ -232,9 +233,6 @@
 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 @@
     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,