summaryrefslogtreecommitdiffstats
path: root/decoder.mk
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2015-05-20 10:00:45 +0300
committerMarco Nelissen <marcone@google.com>2015-06-25 08:25:43 -0700
commitb8681a4380ad0c2a98e4867fb33942aa7f7772bf (patch)
tree1c6173cde741f5a659203b6bad874f6fdec7b4a9 /decoder.mk
parent3749f6f435e79624f72841e866245d84195551cd (diff)
downloadandroid_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 'decoder.mk')
-rw-r--r--decoder.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/decoder.mk b/decoder.mk
index 7df8d17..8b9bd55 100644
--- a/decoder.mk
+++ b/decoder.mk
@@ -9,8 +9,8 @@ LOCAL_MODULE := libavcdec
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_CFLAGS += -D_LIB -DMULTICORE -fPIC -UAPPLY_CONCEALMENT -UINSERT_LOGO -DTHREAD_QUAD_CORE
-LOCAL_CFLAGS += -O3 -DANDROID
+LOCAL_CFLAGS += -fPIC
+LOCAL_CFLAGS += -O3
LOCAL_C_INCLUDES := $(LOCAL_PATH)/decoder $(LOCAL_PATH)/common