commit b82e95c10abcba401fca11cd205a9ede93ca8389
author Elliott Hughes <enh@google.com> Tue Apr 16 21:58:17 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 16 21:58:17 2024 +0000
tree 5ebc9659df8f0f52fd808a4b720c45fe5acf88e5
parent fbef1f2ffd7ccad2c6513a7586f1476ec501274f
parent 35627f8b0724b2e28389fd36c547c6318e938e03

Android.bp: neon has been on by default for years now. am: 3ed0ddb078 am: 35627f8b07

Original change: https://android-review.googlesource.com/c/platform/external/renderscript-intrinsics-replacement-toolkit/+/3032883

Change-Id: I94f030bb496096e6f4fce71053498dcbeefef083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

renderscript-toolkit/src/main/cpp/Android.bp

diff --git a/renderscript-toolkit/src/main/cpp/Android.bp b/renderscript-toolkit/src/main/cpp/Android.bp
index c3acebf..f7b25d6 100644
--- a/renderscript-toolkit/src/main/cpp/Android.bp
+++ b/renderscript-toolkit/src/main/cpp/Android.bp
@@ -83,6 +83,7 @@
         },
         arm: {
             cflags: [
+                "-DARCH_ARM_HAVE_NEON",
                 "-DARCH_ARM_HAVE_VFP",
                 "-DARCH_ARM_USE_INTRINSICS",
             ],
@@ -95,12 +96,6 @@
                 "Resize_neon.S",
                 "YuvToRgb_neon.S",
             ],
-            asflags: ["-mfpu=neon"],
-            neon: {
-                cflags: [
-                    "-DARCH_ARM_HAVE_NEON",
-                ],
-            },
         },
     },
 }