Remove useless `neon:` clause. am: 62a3b8ca4a am: e573552c6d
Original change: https://android-review.googlesource.com/c/platform/external/libmpeg2/+/3010320
Change-Id: I1ec07d765006d627c2e5d7427fb80570fa68da74
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.bp b/Android.bp
index df34bbc..4b82f9f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -86,36 +86,21 @@
srcs: [
"common/arm/ideint_function_selector.c",
"decoder/arm/impeg2d_function_selector.c",
+ "common/arm/icv_sad_a9.s",
+ "common/arm/icv_variance_a9.s",
+ "common/arm/ideint_cac_a9.s",
+ "common/arm/ideint_function_selector_a9.c",
+ "common/arm/ideint_spatial_filter_a9.s",
+ "common/arm/impeg2_format_conv.s",
+ "common/arm/impeg2_idct.s",
+ "common/arm/impeg2_inter_pred.s",
+ "common/arm/impeg2_mem_func.s",
+ "decoder/arm/impeg2d_function_selector_a9q.c",
],
- neon: {
- srcs: [
- "common/arm/icv_sad_a9.s",
- "common/arm/icv_variance_a9.s",
- "common/arm/ideint_cac_a9.s",
- "common/arm/ideint_function_selector_a9.c",
- "common/arm/ideint_spatial_filter_a9.s",
- "common/arm/impeg2_format_conv.s",
- "common/arm/impeg2_idct.s",
- "common/arm/impeg2_inter_pred.s",
- "common/arm/impeg2_mem_func.s",
- "decoder/arm/impeg2d_function_selector_a9q.c",
- ],
- cflags: [
- "-UDISABLE_NEON",
- "-UDEFAULT_ARCH",
- "-DDEFAULT_ARCH=D_ARCH_ARM_A9Q",
- ],
- },
-
cflags: [
- "-DDISABLE_NEONINTR",
"-DARM",
- "-DARMGCC",
-
- // These are overriden by armv7_a_neon
- "-DDISABLE_NEON",
- "-DDEFAULT_ARCH=D_ARCH_ARM_NONEON",
+ "-DDEFAULT_ARCH=D_ARCH_ARM_A9Q",
],
instruction_set: "arm",
},
@@ -123,10 +108,7 @@
arm64: {
cflags: [
"-DARMV8",
- "-DDISABLE_NEONINTR",
"-DARM",
- "-DARMGCC",
-
"-DDEFAULT_ARCH=D_ARCH_ARMV8_GENERIC",
],
local_include_dirs: [
diff --git a/cmake/utils.cmake b/cmake/utils.cmake
index 559ebe6..cdd091f 100644
--- a/cmake/utils.cmake
+++ b/cmake/utils.cmake
@@ -35,8 +35,7 @@
if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
add_definitions(-DARMV8 -DDEFAULT_ARCH=D_ARCH_ARMV8_GENERIC -DENABLE_NEON)
elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch32")
- add_definitions(-DARMV7 -DDEFAULT_ARCH=D_ARCH_ARM_A9Q -DENABLE_NEON
- -DDISABLE_NEONINTR)
+ add_definitions(-DARMV7 -DDEFAULT_ARCH=D_ARCH_ARM_A9Q -DENABLE_NEON)
else()
add_definitions(-DX86 -DX86_LINUX=1 -DDISABLE_AVX2
-DDEFAULT_ARCH=D_ARCH_X86_SSE42)
