commit 90ec4adf8b56b07fb216d0dddda9d57908f9b5c6
author Ryan Prichard <rprichard@google.com> Thu Mar 29 21:31:46 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 29 21:31:46 2018 +0000
tree 7301bdf2bddf1eeb53cf289b0b529a4d9817c93c
parent e5a77d9bcab8eae445041c5a8a63f3d380d963d7
parent 4f5e500adea331284a11a067072d79139afd8002

Merge "Add prebuilt modules for static libs used with NDK STLs"

stl.bp

diff --git a/stl.bp b/stl.bp
index 0abba1e..fc1648d 100644
--- a/stl.bp
+++ b/stl.bp
@@ -5,6 +5,25 @@
 ]
 
 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,
 }