Merge "Remove obsolete `neon:` clause." into main
diff --git a/Android.bp b/Android.bp
index e7800af..4170b93 100644
--- a/Android.bp
+++ b/Android.bp
@@ -101,15 +101,11 @@
         arm: {
             cflags: [
                 "-DFORCE_ARM_CODEGEN",
+                "-DARCH_ARM_HAVE_NEON",
                 "-DARCH_ARM_HAVE_VFP",
+                "-DARCH_ARM_HAVE_VFP_D32",
                 "-DPROVIDE_ARM64_CODEGEN",
             ],
-            neon: {
-                cflags: [
-                    "-DARCH_ARM_HAVE_VFP_D32",
-                    "-DARCH_ARM_HAVE_NEON",
-                ],
-            },
         },
         arm64: {
             cflags: [