diff options
| author | Mohammad Islam <samiul@google.com> | 2021-10-01 12:52:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-01 12:52:23 +0000 |
| commit | b935f15830b18ca88764684c5f9ec4967c7f616e (patch) | |
| tree | c12323e0c3c5550550e512027c3a66271b7bed9a | |
| parent | 94516a7efcda3796aea83246b5d404b2d9f8c83e (diff) | |
| parent | 8cd952395060fa9215d3ba72113562f18d5f636a (diff) | |
| download | native-b935f15830b18ca88764684c5f9ec4967c7f616e.tar.gz | |
Merge "libbinder: split out PackageManagerNative aidl"
| -rw-r--r-- | cmds/cmd/Android.bp | 1 | ||||
| -rw-r--r-- | cmds/dumpstate/Android.bp | 2 | ||||
| -rw-r--r-- | cmds/dumpsys/Android.bp | 4 | ||||
| -rw-r--r-- | libs/binder/Android.bp | 13 | ||||
| -rw-r--r-- | services/sensorservice/Android.bp | 4 |
5 files changed, 15 insertions, 9 deletions
diff --git a/cmds/cmd/Android.bp b/cmds/cmd/Android.bp index c900a24e15..c3d2601444 100644 --- a/cmds/cmd/Android.bp +++ b/cmds/cmd/Android.bp @@ -49,6 +49,7 @@ cc_binary { "liblog", "libselinux", "libbinder", + "packagemanager_aidl-cpp", ], cflags: [ diff --git a/cmds/dumpstate/Android.bp b/cmds/dumpstate/Android.bp index aff32c38c2..74dbf4b764 100644 --- a/cmds/dumpstate/Android.bp +++ b/cmds/dumpstate/Android.bp @@ -100,6 +100,7 @@ cc_defaults { "liblog", "libutils", "libbinderdebug", + "packagemanager_aidl-cpp", ], srcs: [ "DumpstateService.cpp", @@ -173,7 +174,6 @@ cc_test { test_suites: ["device-tests"], } - // =======================# // dumpstate_test_fixture # // =======================# diff --git a/cmds/dumpsys/Android.bp b/cmds/dumpsys/Android.bp index 6ab6b7f951..ceb16cb989 100644 --- a/cmds/dumpsys/Android.bp +++ b/cmds/dumpsys/Android.bp @@ -64,6 +64,10 @@ cc_binary { srcs: [ "main.cpp", ], + + shared_libs: [ + "packagemanager_aidl-cpp", + ], } cc_binary { diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index aff9e2559e..8e0ac17b47 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -64,9 +64,6 @@ libbinder_device_interface_sources = [ "PermissionCache.cpp", "PermissionController.cpp", ] -libbinder_no_vendor_interface_sources = [ - ":packagemanager_aidl", -] cc_library { name: "libbinder", @@ -130,7 +127,7 @@ cc_library { "TextOutput.cpp", "Utils.cpp", ":libbinder_aidl", - ] + libbinder_no_vendor_interface_sources, + ], target: { android: { @@ -142,7 +139,7 @@ cc_library { }, }, vendor: { - exclude_srcs: libbinder_device_interface_sources + libbinder_no_vendor_interface_sources, + exclude_srcs: libbinder_device_interface_sources, }, darwin: { enabled: false, @@ -296,8 +293,11 @@ filegroup { path: "aidl", } -filegroup { +aidl_interface { name: "packagemanager_aidl", + unstable: true, + local_include_dir: "aidl", + host_supported: true, srcs: [ "aidl/android/content/pm/IPackageChangeObserver.aidl", "aidl/android/content/pm/IPackageManagerNative.aidl", @@ -306,7 +306,6 @@ filegroup { "aidl/android/content/pm/ApexStagedEvent.aidl", "aidl/android/content/pm/StagedApexInfo.aidl", ], - path: "aidl", } aidl_interface { diff --git a/services/sensorservice/Android.bp b/services/sensorservice/Android.bp index 4151b4512f..bba6e22354 100644 --- a/services/sensorservice/Android.bp +++ b/services/sensorservice/Android.bp @@ -36,7 +36,7 @@ cc_library_shared { "-Wall", "-Werror", "-Wextra", - "-fvisibility=hidden" + "-fvisibility=hidden", ], header_libs: [ @@ -60,6 +60,7 @@ cc_library_shared { "libbase", "libhidlbase", "libfmq", + "packagemanager_aidl-cpp", "android.hardware.sensors@1.0", "android.hardware.sensors@2.0", "android.hardware.sensors@2.1", @@ -76,6 +77,7 @@ cc_library_shared { "libsensor", "libsensorprivacy", "libpermission", + "packagemanager_aidl-cpp", ], } |