summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-04-02 23:15:32 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-04-02 23:15:32 +0000
commit0d9e1ac41ce85f8d97ff2951831afef1150910c4 (patch)
treef3eb28fbeba57bba75c45d04007f4f9f673e1288
parentb8247961887c8b6538d764f9ec9a2694fbd069ea (diff)
parent4ecdbe82d9ff409ca3c6c3bbd5fb74ebd597da62 (diff)
downloadrs-0d9e1ac41ce85f8d97ff2951831afef1150910c4.tar.gz
Snap for 11662267 from 4ecdbe82d9ff409ca3c6c3bbd5fb74ebd597da62 to sdk-release
Change-Id: Ie4c598ec44f8c5d4f69de1e2e4ccfdeefe9c63ee
-rw-r--r--cpu_ref/Android.bp9
-rw-r--r--support.bp6
2 files changed, 2 insertions, 13 deletions
diff --git a/cpu_ref/Android.bp b/cpu_ref/Android.bp
index 7d76d66a..37db140c 100644
--- a/cpu_ref/Android.bp
+++ b/cpu_ref/Android.bp
@@ -54,6 +54,7 @@ cc_library_shared {
arm: {
cflags: [
+ "-DARCH_ARM_HAVE_NEON",
"-DARCH_ARM_HAVE_VFP",
"-DARCH_ARM_USE_INTRINSICS",
],
@@ -67,14 +68,6 @@ cc_library_shared {
"rsCpuIntrinsics_neon_Resize.S",
"rsCpuIntrinsics_neon_YuvToRGB.S",
],
-
- asflags: ["-mfpu=neon"],
-
- neon: {
- cflags: [
- "-DARCH_ARM_HAVE_NEON",
- ],
- },
},
x86: {
diff --git a/support.bp b/support.bp
index 07320536..81d6dfc3 100644
--- a/support.bp
+++ b/support.bp
@@ -111,10 +111,10 @@ cc_defaults {
arch: {
arm: {
cflags: [
+ "-DARCH_ARM_HAVE_NEON",
"-DARCH_ARM_HAVE_VFP",
"-DARCH_ARM_USE_INTRINSICS",
],
- asflags: ["-mfpu=neon"],
srcs: [
"cpu_ref/rsCpuIntrinsics_neon_3DLUT.S",
"cpu_ref/rsCpuIntrinsics_neon_Blend.S",
@@ -124,10 +124,6 @@ cc_defaults {
"cpu_ref/rsCpuIntrinsics_neon_Resize.S",
"cpu_ref/rsCpuIntrinsics_neon_YuvToRGB.S",
],
-
- neon: {
- cflags: ["-DARCH_ARM_HAVE_NEON"]
- },
},
arm64: {