diff options
| author | 2023-05-17 18:30:13 +0000 | |
|---|---|---|
| committer | 2023-05-17 18:30:13 +0000 | |
| commit | a97790317ab9ab8c4194cb7d127bdeb3fdffb032 (patch) | |
| tree | 1e6fca9ab04d74dd0271773fc8a0cd1222f5572d | |
| parent | 5383d672a84f619c2f92f0e6d94220b7889960cc (diff) | |
| parent | 3c0960d65a289ba6f1c84020b258beea31b1d6fc (diff) | |
Merge "Replace filegroup with aidl_library module type" am: 3c0960d65a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2574736
Change-Id: I3de358c83f25e187dc45414cca759079939c86c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/Android.bp | 13 | ||||
| -rw-r--r-- | libs/services/Android.bp | 7 |
2 files changed, 13 insertions, 7 deletions
diff --git a/core/java/Android.bp b/core/java/Android.bp index 8ceea92957ed..5d7d7ba2379c 100644 --- a/core/java/Android.bp +++ b/core/java/Android.bp @@ -31,9 +31,14 @@ filegroup { srcs: ["android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl"], } -filegroup { - name: "IDropBoxManagerService.aidl", - srcs: ["com/android/internal/os/IDropBoxManagerService.aidl"], +aidl_library { + name: "IDropBoxManagerService_aidl", + srcs: [ + "com/android/internal/os/IDropBoxManagerService.aidl", + ], + hdrs: [ + "android/os/DropBoxManager.aidl", + ], } filegroup { @@ -146,7 +151,7 @@ filegroup { ], } -filegroup { +aidl_library { name: "ILogcatManagerService_aidl", srcs: ["android/os/logcat/ILogcatManagerService.aidl"], } diff --git a/libs/services/Android.bp b/libs/services/Android.bp index f656ebfc3b77..0b7e7d37718d 100644 --- a/libs/services/Android.bp +++ b/libs/services/Android.bp @@ -26,8 +26,6 @@ package { cc_library_shared { name: "libservices", srcs: [ - ":IDropBoxManagerService.aidl", - ":ILogcatManagerService_aidl", "src/content/ComponentName.cpp", "src/os/DropBoxManager.cpp", ], @@ -42,7 +40,10 @@ cc_library_shared { "libbase_headers", ], aidl: { - include_dirs: ["frameworks/base/core/java/"], + libs: [ + "ILogcatManagerService_aidl", + "IDropBoxManagerService_aidl", + ], }, export_include_dirs: ["include"], |