summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-08-10 20:25:45 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-08-10 20:25:45 +0000
commit0bfd320f7ef2d78044f666eabe764632fa456c45 (patch)
tree86c9de3bb8b59eb350939de0246f82853ae2e96e
parentf8cd7cae4b916b642c1798f179209cedf2bd8792 (diff)
parent9ccb8ddfca28db83fd6d82b9fb59f7a4144ffab5 (diff)
downloadnative-0bfd320f7ef2d78044f666eabe764632fa456c45.tar.gz
Merge "Remove framework_native_aidl and use its child filegroups directly"
-rw-r--r--Android.bp12
-rw-r--r--libs/gui/Android.bp3
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 6641b7777c..78731b1a7f 100644
--- a/libs/gui/Android.bp
+++ b/libs/gui/Android.bp
@@ -161,7 +161,8 @@ cc_library_shared {
],
srcs: [
- ":framework_native_aidl",
+ ":framework_native_aidl_binder",
+ ":framework_native_aidl_gui",
":inputconstants_aidl",
":libgui_bufferqueue_sources",