Merge "Add prebuilt modules for static libs used with NDK STLs"android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8

1 files changed, 19 insertions, 0 deletions

diff --git a/stl.bp b/stl.bp
index 0abba1ef4..fc1648dc7 100644
--- a/stl.bp
+++ b/stl.bp
@@ -5,6 +5,25 @@ libcxx_includes =  [
 ]
 
 ndk_prebuilt_static_stl {
+    name: "ndk_libandroid_support",
+}
+
+ndk_prebuilt_static_stl {
+    name: "ndk_libc++abi",
+}
+
+// The LLVM libunwind unwinder. This unwinder is only used for arm32.
+ndk_prebuilt_static_stl {
+    name: "ndk_libunwind",
+    enabled: false,
+    arch: {
+        arm: {
+            enabled: true,
+        },
+    },
+}
+
+ndk_prebuilt_static_stl {
     name: "ndk_libc++_static",
     export_include_dirs: libcxx_includes,
 }