diff options
| author | 2023-06-13 02:05:36 +0000 | |
|---|---|---|
| committer | 2023-06-13 02:05:36 +0000 | |
| commit | 94c56820dd9afeedf2b6eb7e3fadd42fadc5898c (patch) | |
| tree | fd2c63f97784ef89a5ca73c3a5648870e198270c | |
| parent | 744636a5816e61b9127cd3dbb24da72fed91171a (diff) | |
| parent | 1dbaea0449b4823134fc1a84998e95ba65bb9bfb (diff) | |
Migrate aidl filegroup to aidl_library am: 37d4dcbba2 am: 1dbaea0449
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23665166
Change-Id: Id257527db8375e5fed20b7f38e456f72f7bd07b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/gui/Android.bp | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp index bf2d7b6243..342f132f0c 100644 --- a/libs/gui/Android.bp +++ b/libs/gui/Android.bp @@ -129,13 +129,24 @@ cc_library_static { }, } -filegroup { +aidl_library { + name: "libgui_aidl_hdrs", + hdrs: [ + "android/gui/DisplayInfo.aidl", + "android/gui/FocusRequest.aidl", + "android/gui/InputApplicationInfo.aidl", + "android/gui/IWindowInfosListener.aidl", + "android/gui/IWindowInfosReportedListener.aidl", + "android/gui/WindowInfo.aidl", + "android/gui/WindowInfosUpdate.aidl", + ], +} + +aidl_library { name: "libgui_aidl", srcs: ["aidl/**/*.aidl"], - path: "aidl/", - aidl: { - deps: [":android_gui_aidl"], - }, + strip_import_prefix: "aidl", + deps: ["libgui_aidl_hdrs"], } filegroup { @@ -147,9 +158,6 @@ filegroup { cc_library_static { name: "libgui_aidl_static", vendor_available: true, - srcs: [ - ":libgui_aidl", - ], shared_libs: [ "libbinder", @@ -175,9 +183,7 @@ cc_library_static { aidl: { export_aidl_headers: true, - include_dirs: [ - "frameworks/native/libs/gui", - ], + libs: ["libgui_aidl"], }, } |