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
diff --git a/decoder.arm.mk b/decoder.arm.mk
index 556e838..07335cd 100644
--- a/decoder.arm.mk
+++ b/decoder.arm.mk
@@ -2,7 +2,7 @@
 libavcd_inc_dir_arm +=  $(LOCAL_PATH)/common/arm
 
 libavcd_srcs_c_arm  += decoder/arm/ih264d_function_selector.c
-libavcd_cflags_arm  += -DDISABLE_NEONINTR  -DARM -DARMGCC
+libavcd_cflags_arm  += -DARM
 
 #LOCAL_ARM_MODE         := arm
 
diff --git a/decoder.arm64.mk b/decoder.arm64.mk
index 423c34d..5d92ed0 100644
--- a/decoder.arm64.mk
+++ b/decoder.arm64.mk
@@ -1,5 +1,5 @@
 libavcd_cflags_arm64 += -DARMV8
-libavcd_cflags_arm64 += -DDISABLE_NEONINTR  -DARM -DARMGCC
+libavcd_cflags_arm64 += -DARM
 
 libavcd_inc_dir_arm64   +=  $(LOCAL_PATH)/decoder/arm
 libavcd_inc_dir_arm64   +=  $(LOCAL_PATH)/common/armv8
diff --git a/decoder.mk b/decoder.mk
index 7df8d17..8b9bd55 100644
--- a/decoder.mk
+++ b/decoder.mk
@@ -9,8 +9,8 @@
 
 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
 
diff --git a/decoder.x86_64.mk b/decoder.x86_64.mk
index 1b018f7..d85cd75 100644
--- a/decoder.x86_64.mk
+++ b/decoder.x86_64.mk
@@ -1,5 +1,4 @@
 libavcd_cflags_x86_64 += -DX86 -DDISABLE_AVX2 -m64 -msse4.2 -mno-avx  -DDEFAULT_ARCH=D_ARCH_X86_SSE42
-libavcd_cflags_x86_64 += -UAPPLY_CONCEALMENT -ULOGO_EN  -DTHREAD_QUAD_CORE
 
 libavcd_inc_dir_x86_64   +=  $(LOCAL_PATH)/decoder/x86
 libavcd_inc_dir_x86_64   +=  $(LOCAL_PATH)/common/x86
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 @@
 #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
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 @@
 #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
 
 
diff --git a/encoder.mk b/encoder.mk
index 11bd802..7efcda2 100644
--- a/encoder.mk
+++ b/encoder.mk
@@ -9,8 +9,8 @@
 
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-LOCAL_CFLAGS += -D_LIB -DMULTICORE -DANDROID -DNDEBUG -UHP_PL -DN_MB_ENABLE -URC_FIXED_POINT -fPIC
-LOCAL_CFLAGS += -O3 -DANDROID
+LOCAL_CFLAGS += -DNDEBUG -UHP_PL -DN_MB_ENABLE -fPIC
+LOCAL_CFLAGS += -O3
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/encoder $(LOCAL_PATH)/common
 
diff --git a/encoder.x86.mk b/encoder.x86.mk
index e9b6a5f..c6833f0 100644
--- a/encoder.x86.mk
+++ b/encoder.x86.mk
@@ -1,4 +1,4 @@
-libavce_cflags_x86 += -DX86 -DDISABLE_AVX2 -m32 -msse4.2 -mno-avx -DDEFAULT_ARCH=D_ARCH_X86_SSE42
+libavce_cflags_x86 += -DX86 -DDISABLE_AVX2 -m32 -msse4.2 -mno-avx
 
 libavce_inc_dir_x86     +=  $(LOCAL_PATH)/encoder/x86
 libavce_inc_dir_x86     +=  $(LOCAL_PATH)/common/x86
diff --git a/encoder.x86_64.mk b/encoder.x86_64.mk
index deb004b..7786353 100644
--- a/encoder.x86_64.mk
+++ b/encoder.x86_64.mk
@@ -1,4 +1,4 @@
-libavce_cflags_x86_64   += -DX86 -DDISABLE_AVX2 -m64 -msse4.2 -mno-avx  -DDEFAULT_ARCH=D_ARCH_X86_SSE42
+libavce_cflags_x86_64   += -DX86 -DDISABLE_AVX2 -m64 -msse4.2 -mno-avx
 
 libavce_inc_dir_x86_64  +=  $(LOCAL_PATH)/encoder/x86
 libavce_inc_dir_x86_64  +=  $(LOCAL_PATH)/common/x86