commit a70e345da023a1e2cbe24c8d9616a1b24152acca
author Elliott Hughes <enh@google.com> Mon Oct 24 21:57:57 2022 +0000
committer Elliott Hughes <enh@google.com> Mon Oct 24 21:57:57 2022 +0000
tree d64cd3537c05d3022d7bf69b6b9af616a62b7f5b
parent a97ac8c069f5b65763d46702f8c3dcdc9242f3fb

Simplify the libm build now we don't support non-neon.

Test: treehugger
Change-Id: I582ee2477186ba25a455b3b63f74e915be861365

libm/Android.bp

diff --git a/libm/Android.bp b/libm/Android.bp
index effd7e9..9b9b5e5 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -282,24 +282,18 @@
         },
     },
 
-    // arch-specific settings
     arch: {
         arm: {
             srcs: [
                 "arm/fenv.c",
+                "arm/floor.S",
+                "arm/sqrt.S",
             ],
-            neon: {
-                srcs: [
-                    "arm/sqrt.S",
-                    "arm/floor.S",
-                ],
-
-                exclude_srcs: [
-                    "upstream-freebsd/lib/msun/src/e_sqrt.c",
-                    "upstream-freebsd/lib/msun/src/e_sqrtf.c",
-                    "upstream-freebsd/lib/msun/src/s_floor.c",
-                ],
-            },
+            exclude_srcs: [
+                "upstream-freebsd/lib/msun/src/e_sqrt.c",
+                "upstream-freebsd/lib/msun/src/e_sqrtf.c",
+                "upstream-freebsd/lib/msun/src/s_floor.c",
+            ],
             instruction_set: "arm",
             pack_relocations: false,
             ldflags: ["-Wl,--hash-style=both"],