summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-09-13 03:04:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-09-13 03:04:23 +0000
commit423d474ea8af6974b775189be50b442f178b050d (patch)
tree99c4f4152e2d43d097b68c0115e3e5c6c7ca14af
parentd2e44d0e6b038cdcc972492be4fbcd8d9c9dc125 (diff)
parenta3ed228b33bb29d795519a77367e7a4d19b096c8 (diff)
downloadndk-423d474ea8af6974b775189be50b442f178b050d.tar.gz
Merge "Create a soong module for ndk_system STL headers" into main am: 63e2c5671e am: 3278dc2723 am: a3ed228b33
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2744135 Change-Id: I5cf4e645c808f9bae4087b4e8f0da41582132a35 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp15
1 files changed, 15 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 9b8550ee3..3c228674a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -75,3 +75,18 @@ cc_library_static {
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",
+ ],
+}