Merge "mathtest is more useful if it tests libm."
diff --git a/Android.bp b/Android.bp
index 821d570..aa28c72 100755
--- a/Android.bp
+++ b/Android.bp
@@ -37,8 +37,8 @@
     stl: "none",
 }
 
-// adb shell "find /data/nativetest/mathtest/ -iname '*.tst' -print0 | xargs -0 cat | /data/nativetest/mathtest/mathtest"
-// adb shell "find /data/nativetest64/mathtest/ -iname '*.tst' -print0 | xargs -0 cat | /data/nativetest64/mathtest/mathtest"
+// adb shell "/data/nativetest64/mathtest/mathtest /data/nativetest64/mathtest/test/testcases/directed/*"
+// adb shell "/data/nativetest/mathtest/mathtest /data/nativetest/mathtest/test/testcases/directed/*"
 cc_test {
     name: "mathtest",
     gtest: false,
@@ -50,7 +50,6 @@
       "test/mathtest.c"
     ],
     data: ["test/testcases/directed/*.tst"],
-    static_libs: ["libarm-optimized-routines"],
     local_include_dirs: ["math/include"],
     target: {
         darwin: {