diff options
| author | Martin Storsjo <martin@martin.st> | 2015-05-20 10:00:45 +0300 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2015-06-25 08:25:43 -0700 |
| commit | b8681a4380ad0c2a98e4867fb33942aa7f7772bf (patch) | |
| tree | 1c6173cde741f5a659203b6bad874f6fdec7b4a9 /encoder.arm.mk | |
| parent | 3749f6f435e79624f72841e866245d84195551cd (diff) | |
| download | android_external_libavc-b8681a4380ad0c2a98e4867fb33942aa7f7772bf.tar.gz android_external_libavc-b8681a4380ad0c2a98e4867fb33942aa7f7772bf.tar.bz2 android_external_libavc-b8681a4380ad0c2a98e4867fb33942aa7f7772bf.zip | |
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.arm.mk')
| -rw-r--r-- | encoder.arm.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/encoder.arm.mk b/encoder.arm.mk index 874c81c..2a09ac2 100644 --- a/encoder.arm.mk +++ b/encoder.arm.mk @@ -1,7 +1,7 @@ libavce_inc_dir_arm += $(LOCAL_PATH)/encoder/arm libavce_inc_dir_arm += $(LOCAL_PATH)/common/arm -libavce_cflags_arm += -DDISABLE_NEONINTR -DARM -DARMGCC +libavce_cflags_arm += -DARM libavce_srcs_c_arm += encoder/arm/ih264e_function_selector.c @@ -35,10 +35,8 @@ libavce_srcs_asm_arm += encoder/arm/ih264e_fmt_conv.s #ME libavce_srcs_asm_arm += encoder/arm/ime_distortion_metrics_a9q.s -libavce_cflags_arm += -DDEFAULT_ARCH=D_ARCH_ARM_A9Q - else #No Neon -libavce_cflags_arm += -DDISABLE_NEON -DDEFAULT_ARCH=D_ARCH_ARM_NONEON +libavce_cflags_arm += -DDISABLE_NEON endif #Neon check libavce_srcs_asm_arm += common/arm/ih264_arm_memory_barrier.s |