summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Spandan Das <spandandas@google.com> 2022-10-25 18:31:03 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-25 18:31:03 +0000
commite5b373b773a0c3744facfa2fdf827ac1ddfb34fb (patch)
tree94d6c1a4239f579dd75113ed8fb1e2447f804a7e
parentfe3b66b0f0d58cc3133c1a29e14f3e93c7c891a4 (diff)
parent7b0895b013853ac49ce3abbdf04f541a029d162b (diff)
Merge "Export libarect_headers to llndk api surface" am: 77f3da77c9 am: 7b0895b013
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2268547 Change-Id: I1c252e5a3dc927822a87e3231945d3811a22981b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libs/arect/Android.bp3
-rw-r--r--libs/nativewindow/Android.bp9
2 files changed, 8 insertions, 4 deletions
diff --git a/libs/arect/Android.bp b/libs/arect/Android.bp
index 76e3e66749..5e539f24e1 100644
--- a/libs/arect/Android.bp
+++ b/libs/arect/Android.bp
@@ -49,6 +49,9 @@ cc_library_headers {
"com.android.media",
"com.android.media.swcodec",
],
+ llndk: {
+ llndk_headers: true,
+ },
}
cc_library_static {
diff --git a/libs/nativewindow/Android.bp b/libs/nativewindow/Android.bp
index d7db6bd174..cedc522f3e 100644
--- a/libs/nativewindow/Android.bp
+++ b/libs/nativewindow/Android.bp
@@ -74,6 +74,9 @@ cc_library {
override_export_include_dirs: [
"include",
],
+ export_llndk_headers: [
+ "libarect_headers",
+ ],
},
export_include_dirs: [
"include",
@@ -108,16 +111,14 @@ cc_library {
],
header_libs: [
+ "libarect_headers",
"libnativebase_headers",
"libnativewindow_headers",
],
// headers we include in our public headers
- export_static_lib_headers: [
- "libarect",
- ],
-
export_header_lib_headers: [
+ "libarect_headers",
"libnativebase_headers",
],