diff options
| author | 2022-08-10 21:31:29 +0000 | |
|---|---|---|
| committer | 2022-08-10 21:31:29 +0000 | |
| commit | b4b94f0fde4ce6695c10306fb574a4c805219c4f (patch) | |
| tree | 6b1d3ce02cc8e763d92dce444a438b894c97f7b3 | |
| parent | 5ce765d38d2775a9d55e9af10cbd1bb865cb0736 (diff) | |
| parent | fc4f24df1f9b2e9c594cc84ed9f047fcb75ee2af (diff) | |
Merge "Remove framework_native_aidl and use its child filegroups directly" am: 0bfd320f7e am: fc4f24df1f
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2179777
Change-Id: I22cc0e9dbdf47c09fdf4599ca0f7bd472d867ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 12 | ||||
| -rw-r--r-- | libs/gui/Android.bp | 3 |
2 files changed, 11 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp index dec6716290..615a7a8727 100644 --- a/Android.bp +++ b/Android.bp @@ -64,14 +64,20 @@ filegroup { name: "framework_native_aidl_binder", srcs: ["aidl/binder/**/*.aidl"], path: "aidl/binder", - visibility: ["//frameworks/native"], + visibility: [ + "//frameworks/native", + "//frameworks/native/libs/gui", + ], } filegroup { name: "framework_native_aidl_gui", srcs: ["aidl/gui/**/*.aidl"], path: "aidl/gui", - visibility: ["//frameworks/native"], + visibility: [ + "//frameworks/native", + "//frameworks/native/libs/gui", + ], } filegroup { @@ -82,7 +88,7 @@ filegroup { ], } -cc_library_headers{ +cc_library_headers { name: "libandroid_headers_private", export_include_dirs: ["include/private"], } diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp index 5a2b92b0ff..56b17aecb2 100644 --- a/libs/gui/Android.bp +++ b/libs/gui/Android.bp @@ -170,7 +170,8 @@ cc_library_shared { ], srcs: [ - ":framework_native_aidl", + ":framework_native_aidl_binder", + ":framework_native_aidl_gui", ":inputconstants_aidl", ":libgui_bufferqueue_sources", |