diff options
| author | 2022-06-23 01:41:38 +0000 | |
|---|---|---|
| committer | 2022-06-23 01:41:38 +0000 | |
| commit | 883155226723066b009c18e7fc0729dc094b2f1e (patch) | |
| tree | 38defde9d3fcf445e74d0841cb0e097b2ecaf7dc | |
| parent | 8f2ed017082310a5756da88dde3b9d491d936970 (diff) | |
| parent | f43e3592205770a25250084fa216aac1af0ccc17 (diff) | |
Merge "Add host support to misc legacy AIDL libs" am: f43e359220
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2105511
Change-Id: I1b3915a8de24839d91958527931099d8a9a604ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/Android.bp | 23 | ||||
| -rw-r--r-- | libs/binder/IServiceManager.cpp | 2 |
2 files changed, 16 insertions, 9 deletions
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index 6d3c88d539..9389bec509 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -60,11 +60,15 @@ cc_library_headers { // // Currently, these are only on system android (not vendor, not host) // TODO(b/183654927) - move these into separate libraries -libbinder_device_interface_sources = [ - "IPermissionController.cpp", - "PermissionCache.cpp", - "PermissionController.cpp", -] + +filegroup { + name: "libbinder_device_interface_sources", + srcs: [ + "IPermissionController.cpp", + "PermissionCache.cpp", + "PermissionController.cpp", + ], +} cc_library { name: "libbinder", @@ -126,19 +130,20 @@ cc_library { "TextOutput.cpp", "Utils.cpp", ":libbinder_aidl", + ":libbinder_device_interface_sources", ], target: { android: { - srcs: libbinder_device_interface_sources, - // NOT static to keep the wire protocol unfrozen static: { enabled: false, }, }, vendor: { - exclude_srcs: libbinder_device_interface_sources, + exclude_srcs: [ + ":libbinder_device_interface_sources", + ], }, darwin: { enabled: false, @@ -366,6 +371,7 @@ filegroup { cc_library { name: "libbatterystats_aidl", + host_supported: true, srcs: [ "IBatteryStats.cpp", ], @@ -378,6 +384,7 @@ cc_library { cc_library { name: "libprocessinfoservice_aidl", + host_supported: true, srcs: [ "IProcessInfoService.cpp", "ProcessInfoService.cpp", diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp index fd2d86857e..fd47783acd 100644 --- a/libs/binder/IServiceManager.cpp +++ b/libs/binder/IServiceManager.cpp @@ -167,7 +167,7 @@ void setDefaultServiceManager(const sp<IServiceManager>& sm) { } } -#if !defined(__ANDROID_VNDK__) && defined(__ANDROID__) +#if !defined(__ANDROID_VNDK__) // IPermissionController is not accessible to vendors bool checkCallingPermission(const String16& permission) |