summaryrefslogtreecommitdiffstats
path: root/encoder.arm64.mk
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2015-05-20 07:00:45 (GMT)
committerMarco Nelissen <marcone@google.com>2015-06-25 15:25:43 (GMT)
commitb8681a4380ad0c2a98e4867fb33942aa7f7772bf (patch)
tree1c6173cde741f5a659203b6bad874f6fdec7b4a9 /encoder.arm64.mk
parent3749f6f435e79624f72841e866245d84195551cd (diff)
downloadandroid_external_libavc-b8681a4380ad0c2a98e4867fb33942aa7f7772bf.zip
android_external_libavc-b8681a4380ad0c2a98e4867fb33942aa7f7772bf.tar.gz
android_external_libavc-b8681a4380ad0c2a98e4867fb33942aa7f7772bf.tar.bz2
Remove unnecessary defines/undefines in the makefiles
The following defines aren't referenced anywhere in the code base: _LIB MULTICORE APPLY_CONCEALMENT THREAD_QUAD_CORE DISABLE_NEONINTR ARMGCC The DEFAULT_ARCH define isn't used within the encoder at all. The ANDROID define isn't referenced anywhere either, and if necessary, the automatically enabled define __ANDROID__ can be used instead. The defines INSERT_LOGO and LOGO_EN were undefined in the makefiles, but that is unnecessary since nothing actually defines them. The decoder x86_64 makefile also undefined LOGO_EN; an architecture specific makefile shouldn't touch such feature settings, otherwise there's a risk that different builds for different architectures behave significantly differently. Change-Id: I13b86c8bf2feb3a381d904a13f18c3b35f40a575
Diffstat (limited to 'encoder.arm64.mk')
-rw-r--r--encoder.arm64.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/encoder.arm64.mk b/encoder.arm64.mk
index 5d2d045..74fcc69 100644
--- a/encoder.arm64.mk
+++ b/encoder.arm64.mk
@@ -1,5 +1,5 @@
libavce_cflags_arm64 += -DARMV8
-libavce_cflags_arm64 += -DDISABLE_NEONINTR -DARM -DARMGCC
+libavce_cflags_arm64 += -DARM
libavce_inc_dir_arm64 += $(LOCAL_PATH)/encoder/arm
libavce_inc_dir_arm64 += $(LOCAL_PATH)/encoder/armv8
@@ -35,9 +35,8 @@ libavce_srcs_asm_arm64 += encoder/armv8/ih264e_half_pel_av8.s
#ME
libavce_srcs_asm_arm64 += encoder/armv8/ime_distortion_metrics_av8.s
-libavce_cflags_arm64 += -DDEFAULT_ARCH=D_ARCH_ARMV8_GENERIC
else
-libavce_cflags_arm64 += -DDISABLE_NEON -DDEFAULT_ARCH=D_ARCH_ARM_NONEON
+libavce_cflags_arm64 += -DDISABLE_NEON
endif