commit fed3636c715b37a18676a1b14d86bc431d426d7e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Sep 13 04:41:51 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 13 04:41:51 2023 +0000
tree 99c4f4152e2d43d097b68c0115e3e5c6c7ca14af
parent 9868bc0c43a4096b07aaf9999033e70861ca8a06
parent 667bf1a56e1da4eac41abd24ee9f006248d70a34

Merge "Create a soong module for ndk_system STL headers" into main am: 63e2c5671e am: 3278dc2723 am: a3ed228b33 am: 423d474ea8 am: 667bf1a56e

Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2744135

Change-Id: Iab7e9743ed0643cc526753acfc8faecf523ee978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 9b8550e..3c22867 100644
--- a/Android.bp
+++ b/Android.bp
@@ -75,3 +75,18 @@
     sdk_version: "minimum",
     export_include_dirs: ["current/sources/android/cpufeatures"],
 }
+
+// A module that encapsulates the header files of NDK System STL
+cc_library_headers {
+    name: "ndk_system",
+    sdk_version: "minimum",
+    sdk_variant_only: true,
+    stl: "none",
+    export_system_include_dirs: ["current/sources/cxx-stl/system/include"],
+    // the headers are available to both the platform and anyapex.
+    // this availability is required to compile jni deps of any android_app in these api domains.
+    apex_available: [
+        "//apex_available:anyapex",
+        "//apex_available:platform",
+    ],
+}