Remove packagemanager_aidl from export_shared_lib_headers
Unless a module is exporting libbinder as export_shared_lib_headers,
there is no reason for it to export packagemanager_aidl. Most of them
are consumers of packagemanager_aidl, not providers.
If Removing packagemanager_aidl from export_shared_lib_headers breaks
the build, then it just means there is some module which is
relying on one of these modules with export_shared_lib_headers as
provider for packagemanager_aidl. We should update them accordingly.
Bug: 183654927
Test: builds + presubmit
Change-Id: I952ec5c58686e1263aabf95587851faf780fe7e1
diff --git a/media/audioserver/Android.bp b/media/audioserver/Android.bp
index be25ffb..e5f9907 100644
--- a/media/audioserver/Android.bp
+++ b/media/audioserver/Android.bp
@@ -25,6 +25,7 @@
],
shared_libs: [
+ "packagemanager_aidl-cpp",
"libaaudioservice",
"libaudioflinger",
"libaudiopolicyservice",
@@ -41,7 +42,6 @@
"libpowermanager",
"libutils",
"libvibrator",
-
],
// TODO check if we still need all of these include directories
diff --git a/media/libaudioclient/Android.bp b/media/libaudioclient/Android.bp
index 9c307ff..d4725d5 100644
--- a/media/libaudioclient/Android.bp
+++ b/media/libaudioclient/Android.bp
@@ -133,6 +133,7 @@
"libutils",
"libvibrator",
"framework-permission-aidl-cpp",
+ "packagemanager_aidl-cpp",
],
export_shared_lib_headers: [
"audioflinger-aidl-cpp",
diff --git a/media/libmediaplayerservice/Android.bp b/media/libmediaplayerservice/Android.bp
index 37f8103..c416a51 100644
--- a/media/libmediaplayerservice/Android.bp
+++ b/media/libmediaplayerservice/Android.bp
@@ -83,7 +83,6 @@
export_shared_lib_headers: [
"libmedia",
"framework-permission-aidl-cpp",
- "packagemanager_aidl-cpp",
],
include_dirs: [
diff --git a/media/libstagefright/Android.bp b/media/libstagefright/Android.bp
index 1e9d4fe..e47e7ff 100644
--- a/media/libstagefright/Android.bp
+++ b/media/libstagefright/Android.bp
@@ -373,7 +373,6 @@
"libmedia",
"android.hidl.allocator@1.0",
"framework-permission-aidl-cpp",
- "packagemanager_aidl-cpp",
],
export_include_dirs: [
diff --git a/media/utils/Android.bp b/media/utils/Android.bp
index 95498a1..e3b837e 100644
--- a/media/utils/Android.bp
+++ b/media/utils/Android.bp
@@ -72,7 +72,6 @@
export_shared_lib_headers: [
"libpermission",
- "packagemanager_aidl-cpp",
],
include_dirs: [
diff --git a/media/utils/fuzzers/Android.bp b/media/utils/fuzzers/Android.bp
index c1698dc..c4dc24f 100644
--- a/media/utils/fuzzers/Android.bp
+++ b/media/utils/fuzzers/Android.bp
@@ -18,6 +18,7 @@
"libutils",
"libbinder",
"framework-permission-aidl-cpp",
+ "packagemanager_aidl-cpp",
],
cflags: [