commit a087d3f3943e65e457096454d38a98ec811c84a6
author Ray Essick <essick@google.com> Tue Dec 06 23:09:11 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 06 23:09:11 2016 +0000
tree 173b42a4807d1cda9f3bedeeffca4e67b598ddef
parent 52f2b5db3844940690dcbe1e703e90f2bbbdd898
parent 5d93b6877d251c777d2f36b2dedd4098c1bde236

Merge "Remove ARCH_ARM_HAVE_NEON dependency from arm64"

decoder.arm64.mk

diff --git a/decoder.arm64.mk b/decoder.arm64.mk
index 5b0414e..6770ea0 100644
--- a/decoder.arm64.mk
+++ b/decoder.arm64.mk
@@ -6,7 +6,6 @@
 
 libmpeg2d_srcs_c_arm64    +=  decoder/arm/impeg2d_function_selector.c
 
-ifeq ($(ARCH_ARM_HAVE_NEON),true)
 libmpeg2d_srcs_c_arm64      +=  decoder/arm/impeg2d_function_selector_av8.c
 libmpeg2d_srcs_c_arm64      +=  common/arm/ideint_function_selector.c
 libmpeg2d_srcs_c_arm64      +=  common/arm/ideint_function_selector_av8.c
@@ -21,11 +20,6 @@
 libmpeg2d_srcs_asm_arm64    +=  common/armv8/impeg2_inter_pred.s
 libmpeg2d_srcs_asm_arm64    +=  common/armv8/impeg2_mem_func.s
 libmpeg2d_cflags_arm += -DDEFAULT_ARCH=D_ARCH_ARMV8_GENERIC
-else
-libmpeg2d_cflags_arm64 += -DDISABLE_NEON -DDEFAULT_ARCH=D_ARCH_ARM_NONEON
-endif
-
-
 
 
 LOCAL_SRC_FILES_arm64 += $(libmpeg2d_srcs_c_arm64) $(libmpeg2d_srcs_asm_arm64)