Export libarect_headers to llndk api surface
Previously, we were exporting the transitive headers of libnativewindow
(libarect_headers) only to core and mainline api domains. This CL
explicitly exports these headers to vendor/product via
lldnk.exoprt_llndk_headers
Also, move the headers of libarect from `export_static_lib_headers` to
`export_header_lib_headers` for consistency.
Bug: 254136046
Test: TH
Test: Manual (detailed below)
$ cat << EOF > mytest.cpp
#include <android/hardware_buffer.h>
EOF
(Add two new Soong modules)
cc_library {
name: "mytest",
srcs: ["mytest.cpp"],
shared_libs: ["libnativewindow"],
}
cc_library {
name: "mytest_vendor",
srcs: ["mytest.cpp"],
shared_libs: ["libnativewindow"],
vendor: true
}
mytest would build ok before and after change
mytest_vendor builds ok only after change
Change-Id: If9d677545ac29f232c6b296312255a63d5ce850c
diff --git a/libs/nativewindow/Android.bp b/libs/nativewindow/Android.bp
index d7db6bd..cedc522 100644
--- a/libs/nativewindow/Android.bp
+++ b/libs/nativewindow/Android.bp
@@ -74,6 +74,9 @@
override_export_include_dirs: [
"include",
],
+ export_llndk_headers: [
+ "libarect_headers",
+ ],
},
export_include_dirs: [
"include",
@@ -108,16 +111,14 @@
],
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",
],