commit 2588ea491e86965d919a298d17f7de87f2ca1e6d
author Elliott Hughes <enh@google.com> Fri Mar 22 00:09:12 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 22 00:09:12 2024 +0000
tree 1ba183a5d2a829a6667e94be2e7e9bb14ad8f838
parent ddd80117b9cff232cd9c28809a4eee617f747025
parent 29748e57d9e9ea7d147d1273f00ba0db848a482b

Merge "Remove useless non-neon support." into main am: cecfbf02fe am: 29748e57d9

Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/3009377

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

toolkit/Android.bp

diff --git a/toolkit/Android.bp b/toolkit/Android.bp
index dc3ca1b..f6caf97 100644
--- a/toolkit/Android.bp
+++ b/toolkit/Android.bp
@@ -64,6 +64,7 @@
 
         arm: {
             cflags: [
+                "-DARCH_ARM_HAVE_NEON",
                 "-DARCH_ARM_HAVE_VFP",
                 "-DARCH_ARM_USE_INTRINSICS",
             ],
@@ -77,14 +78,6 @@
                 "Resize_neon.S",
                 "YuvToRgb_neon.S",
             ],
-
-            asflags: ["-mfpu=neon"],
-
-            neon: {
-                cflags: [
-                    "-DARCH_ARM_HAVE_NEON",
-                ],
-            },
         },
 
         x86: {