diff options
author | Steven Moreland <smoreland@google.com> | 2021-04-05 23:17:21 +0000 |
---|---|---|
committer | Steven Moreland <smoreland@google.com> | 2021-04-07 22:14:19 +0000 |
commit | 710ad48ec7cb53982b8d390ee94d7863351abedc (patch) | |
tree | f98da13fdfa927c42d47a577278a19b359f10fcf | |
parent | 8a2085c52ffd3037397a42c2bfb29161f1607a63 (diff) | |
download | native-710ad48ec7cb53982b8d390ee94d7863351abedc.tar.gz |
libbinder: split out activitymanager
libbinder is used in far more contexts than this - minimizing cost to
use libbinder.
Bug: 183654927
Test: boot
Change-Id: I3a7d6888a6b1b5370ff96e137dba2c091c00dabc
-rw-r--r-- | libs/binder/Android.bp | 17 | ||||
-rw-r--r-- | libs/binder/include_activitymanager/binder/ActivityManager.h (renamed from libs/binder/include/binder/ActivityManager.h) | 0 | ||||
-rw-r--r-- | libs/binder/include_activitymanager/binder/IActivityManager.h (renamed from libs/binder/include/binder/IActivityManager.h) | 2 | ||||
-rw-r--r-- | libs/binder/include_activitymanager/binder/IUidObserver.h (renamed from libs/binder/include/binder/IUidObserver.h) | 0 | ||||
-rw-r--r-- | services/sensorservice/Android.bp | 8 |
5 files changed, 18 insertions, 9 deletions
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index 05c32b383f..f85c4dce79 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -60,16 +60,13 @@ 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 = [ - "ActivityManager.cpp", "AppOpsManager.cpp", - "IActivityManager.cpp", "IAppOpsCallback.cpp", "IAppOpsService.cpp", + "IPermissionController.cpp", - "IUidObserver.cpp", "PermissionCache.cpp", "PermissionController.cpp", - ":activity_manager_procstate_aidl", ] cc_library { @@ -297,13 +294,21 @@ cc_library { ], } -// TODO(b/183654927): initially empty lib to work around some merge conflicts cc_library { name: "libactivitymanager_aidl", - srcs: [], + srcs: [ + "ActivityManager.cpp", + "IActivityManager.cpp", + "IUidObserver.cpp", + ":activity_manager_procstate_aidl", + ], + export_include_dirs: ["include_activitymanager"], shared_libs: [ "libbinder", "libutils", "liblog", ], + aidl: { + export_aidl_headers: true, + }, } diff --git a/libs/binder/include/binder/ActivityManager.h b/libs/binder/include_activitymanager/binder/ActivityManager.h index b90dc862ce..b90dc862ce 100644 --- a/libs/binder/include/binder/ActivityManager.h +++ b/libs/binder/include_activitymanager/binder/ActivityManager.h diff --git a/libs/binder/include/binder/IActivityManager.h b/libs/binder/include_activitymanager/binder/IActivityManager.h index fde56a01a4..e3b5e43760 100644 --- a/libs/binder/include/binder/IActivityManager.h +++ b/libs/binder/include_activitymanager/binder/IActivityManager.h @@ -18,8 +18,8 @@ #ifndef __ANDROID_VNDK__ -#include <binder/IInterface.h> #include <binder/IUidObserver.h> +#include <binder/IInterface.h> namespace android { diff --git a/libs/binder/include/binder/IUidObserver.h b/libs/binder/include_activitymanager/binder/IUidObserver.h index 9291c0b45f..9291c0b45f 100644 --- a/libs/binder/include/binder/IUidObserver.h +++ b/libs/binder/include_activitymanager/binder/IUidObserver.h diff --git a/services/sensorservice/Android.bp b/services/sensorservice/Android.bp index c769e975e3..9aecaff409 100644 --- a/services/sensorservice/Android.bp +++ b/services/sensorservice/Android.bp @@ -49,6 +49,7 @@ cc_library_shared { "libhardware_legacy", "libutils", "liblog", + "libactivitymanager_aidl", "libbatterystats_aidl", "libbinder", "libsensor", @@ -69,8 +70,11 @@ cc_library_shared { generated_headers: ["framework-cppstream-protos"], - // our public headers depend on libsensor and libsensorprivacy - export_shared_lib_headers: ["libsensor", "libsensorprivacy"], + export_shared_lib_headers: [ + "libactivitymanager_aidl", + "libsensor", + "libsensorprivacy", + ], } cc_binary { |