aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-03-23 17:06:57 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-03-23 17:06:57 +0000
commit3df18e52d4e68ecdabff9740b55637f2b3bf1e7f (patch)
tree76226f1fbc5c1cbe2c18c537179bec15fa4ce57d
parent599b082f099b5d6c1cdcb96f3ec8378f4ea21bf4 (diff)
parentbf9750b4cfb0510f85c71743085c7c76217d5b20 (diff)
downloadlibvpx-3df18e52d4e68ecdabff9740b55637f2b3bf1e7f.tar.gz
Merge "Remove useless `neon:` clause." into mainHEADmastermain
-rw-r--r--Android.bp18
-rw-r--r--Android.bp.in18
2 files changed, 12 insertions, 24 deletions
diff --git a/Android.bp b/Android.bp
index b770ff9a0..573fdaffc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1187,13 +1187,11 @@ cc_library {
arch: {
// configured to require the neon unit
arm: {
- neon: {
- // Want arm, not thumb, optimized
- instruction_set: "arm",
+ // Want arm, not thumb, optimized
+ instruction_set: "arm",
- srcs: libvpx_arm_neon_c_srcs + libvpx_arm_neon_asm_srcs,
- local_include_dirs: ["config/arm-neon"],
- },
+ srcs: libvpx_arm_neon_c_srcs + libvpx_arm_neon_asm_srcs,
+ local_include_dirs: ["config/arm-neon"],
},
arm64: {
@@ -1263,9 +1261,7 @@ cc_fuzz {
},
arch: {
arm: {
- neon: {
- local_include_dirs: ["config/arm-neon"],
- },
+ local_include_dirs: ["config/arm-neon"],
},
arm64: {
@@ -1299,9 +1295,7 @@ cc_fuzz {
},
arch: {
arm: {
- neon: {
- local_include_dirs: ["config/arm-neon"],
- },
+ local_include_dirs: ["config/arm-neon"],
},
arm64: {
diff --git a/Android.bp.in b/Android.bp.in
index befe73c22..c88d8a5da 100644
--- a/Android.bp.in
+++ b/Android.bp.in
@@ -52,13 +52,11 @@ cc_library {
arch: {
// configured to require the neon unit
arm: {
- neon: {
- // Want arm, not thumb, optimized
- instruction_set: "arm",
+ // Want arm, not thumb, optimized
+ instruction_set: "arm",
- srcs: libvpx_arm_neon_c_srcs + libvpx_arm_neon_asm_srcs,
- local_include_dirs: ["config/arm-neon"],
- },
+ srcs: libvpx_arm_neon_c_srcs + libvpx_arm_neon_asm_srcs,
+ local_include_dirs: ["config/arm-neon"],
},
arm64: {
@@ -128,9 +126,7 @@ cc_fuzz {
},
arch: {
arm: {
- neon: {
- local_include_dirs: ["config/arm-neon"],
- },
+ local_include_dirs: ["config/arm-neon"],
},
arm64: {
@@ -164,9 +160,7 @@ cc_fuzz {
},
arch: {
arm: {
- neon: {
- local_include_dirs: ["config/arm-neon"],
- },
+ local_include_dirs: ["config/arm-neon"],
},
arm64: {