commit 3df18e52d4e68ecdabff9740b55637f2b3bf1e7f
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Mar 23 17:06:57 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 23 17:06:57 2024 +0000
tree 76226f1fbc5c1cbe2c18c537179bec15fa4ce57d
parent 599b082f099b5d6c1cdcb96f3ec8378f4ea21bf4
parent bf9750b4cfb0510f85c71743085c7c76217d5b20

Merge "Remove useless `neon:` clause." into main

Android.bp

diff --git a/Android.bp b/Android.bp
index b770ff9..573fdaf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1187,13 +1187,11 @@
     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 @@
     },
     arch: {
         arm: {
-            neon: {
-                local_include_dirs: ["config/arm-neon"],
-            },
+            local_include_dirs: ["config/arm-neon"],
         },
 
         arm64: {
@@ -1299,9 +1295,7 @@
     },
     arch: {
         arm: {
-            neon: {
-                local_include_dirs: ["config/arm-neon"],
-            },
+            local_include_dirs: ["config/arm-neon"],
         },
 
         arm64: {

Android.bp.in

diff --git a/Android.bp.in b/Android.bp.in
index befe73c..c88d8a5 100644
--- a/Android.bp.in
+++ b/Android.bp.in
@@ -52,13 +52,11 @@
     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 @@
     },
     arch: {
         arm: {
-            neon: {
-                local_include_dirs: ["config/arm-neon"],
-            },
+            local_include_dirs: ["config/arm-neon"],
         },
 
         arm64: {
@@ -164,9 +160,7 @@
     },
     arch: {
         arm: {
-            neon: {
-                local_include_dirs: ["config/arm-neon"],
-            },
+            local_include_dirs: ["config/arm-neon"],
         },
 
         arm64: {