commit e5b373b773a0c3744facfa2fdf827ac1ddfb34fb
author Spandan Das <spandandas@google.com> Tue Oct 25 18:31:03 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 25 18:31:03 2022 +0000
tree 94d6c1a4239f579dd75113ed8fb1e2447f804a7e
parent fe3b66b0f0d58cc3133c1a29e14f3e93c7c891a4
parent 7b0895b013853ac49ce3abbdf04f541a029d162b

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>

libs/arect/Android.bp

diff --git a/libs/arect/Android.bp b/libs/arect/Android.bp
index 76e3e66..5e539f2 100644
--- a/libs/arect/Android.bp
+++ b/libs/arect/Android.bp
@@ -49,6 +49,9 @@
         "com.android.media",
         "com.android.media.swcodec",
     ],
+    llndk: {
+        llndk_headers: true,
+    },
 }
 
 cc_library_static {

libs/nativewindow/Android.bp

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",
     ],