diff --git a/libm/Android.bp b/libm/Android.bp
index 0e3bdf7..fee2bac 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -9,6 +9,8 @@
     recovery_available: true,
     static_ndk_lib: true,
 
+    whole_static_libs: ["libarm-optimized-routines"],
+
     srcs: [
         "upstream-freebsd/lib/msun/bsdsrc/b_exp.c",
         "upstream-freebsd/lib/msun/bsdsrc/b_log.c",
@@ -28,7 +30,6 @@
         "upstream-freebsd/lib/msun/src/e_cosh.c",
         "upstream-freebsd/lib/msun/src/e_coshf.c",
         "upstream-freebsd/lib/msun/src/e_exp.c",
-        "upstream-freebsd/lib/msun/src/e_expf.c",
         "upstream-freebsd/lib/msun/src/e_fmod.c",
         "upstream-freebsd/lib/msun/src/e_fmodf.c",
         "upstream-freebsd/lib/msun/src/e_gamma.c",
@@ -50,11 +51,8 @@
         "upstream-freebsd/lib/msun/src/e_log10.c",
         "upstream-freebsd/lib/msun/src/e_log10f.c",
         "upstream-freebsd/lib/msun/src/e_log2.c",
-        "upstream-freebsd/lib/msun/src/e_log2f.c",
         "upstream-freebsd/lib/msun/src/e_log.c",
-        "upstream-freebsd/lib/msun/src/e_logf.c",
         "upstream-freebsd/lib/msun/src/e_pow.c",
-        "upstream-freebsd/lib/msun/src/e_powf.c",
         "upstream-freebsd/lib/msun/src/e_remainder.c",
         "upstream-freebsd/lib/msun/src/e_remainderf.c",
         "upstream-freebsd/lib/msun/src/e_rem_pio2.c",
@@ -100,7 +98,6 @@
         "upstream-freebsd/lib/msun/src/s_copysign.c",
         "upstream-freebsd/lib/msun/src/s_copysignf.c",
         "upstream-freebsd/lib/msun/src/s_cos.c",
-        "upstream-freebsd/lib/msun/src/s_cosf.c",
         "upstream-freebsd/lib/msun/src/s_cpow.c",
         "upstream-freebsd/lib/msun/src/s_cpowf.c",
         "upstream-freebsd/lib/msun/src/s_cpowl.c",
@@ -119,7 +116,6 @@
         "upstream-freebsd/lib/msun/src/s_erf.c",
         "upstream-freebsd/lib/msun/src/s_erff.c",
         "upstream-freebsd/lib/msun/src/s_exp2.c",
-        "upstream-freebsd/lib/msun/src/s_exp2f.c",
         "upstream-freebsd/lib/msun/src/s_expm1.c",
         "upstream-freebsd/lib/msun/src/s_expm1f.c",
         "upstream-freebsd/lib/msun/src/s_fdim.c",
@@ -169,8 +165,6 @@
         "upstream-freebsd/lib/msun/src/s_significandf.c",
         "upstream-freebsd/lib/msun/src/s_sin.c",
         "upstream-freebsd/lib/msun/src/s_sincos.c",
-        "upstream-freebsd/lib/msun/src/s_sincosf.c",
-        "upstream-freebsd/lib/msun/src/s_sinf.c",
         "upstream-freebsd/lib/msun/src/s_tan.c",
         "upstream-freebsd/lib/msun/src/s_tanf.c",
         "upstream-freebsd/lib/msun/src/s_tanh.c",