Package bionic static libraries in the NDK.

Test: build/soong/scripts/build-ndk-prebuilts.sh Bug: android/ndk#272 Change-Id: Ibb21d799fdcf230ed45db0b809e20dd86d2d8e52
spsforks · Oct 27, 2017 · bdc7eef · bdc7eef
1 parent 34cf31a
commit bdc7eef
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/libc/Android.bp b/libc/Android.bp
@@ -1834,6 +1834,7 @@ cc_library_static {
 cc_library {
     defaults: ["libc_defaults"],
     name: "libc",
+    static_ndk_lib: true,
     product_variables: {
         platform_sdk_version: {
             asflags: ["-DPLATFORM_SDK_VERSION=%d"],
@@ -1943,8 +1944,9 @@ cc_library {
         "bionic/new.cpp",
     ],
     name: "libstdc++",
+    static_ndk_lib: true,
     system_shared_libs: ["libc"],
-		static_libs: ["libasync_safe"],
+    static_libs: ["libasync_safe"],
 
     //TODO (dimitry): This is to work around b/24465209. Remove after root cause is fixed
     arch: {

diff --git a/libdl/Android.bp b/libdl/Android.bp
@@ -25,6 +25,7 @@ cc_library_static {
 
 cc_library {
     name: "libdl",
+    static_ndk_lib: true,
 
     defaults: ["linux_bionic_supported"],
 

diff --git a/libm/Android.bp b/libm/Android.bp
@@ -6,6 +6,7 @@ bionic_coverage = false
 cc_library {
     name: "libm",
     defaults: ["linux_bionic_supported"],
+    static_ndk_lib: true,
 
     srcs: [
         "upstream-freebsd/lib/msun/bsdsrc/b_exp.c",