diff --git a/decoder/jni/aac-decoder/Android.mk b/decoder/jni/aac-decoder/Android.mk
index 746f3fc..02fdf30 100644
--- a/decoder/jni/aac-decoder/Android.mk
+++ b/decoder/jni/aac-decoder/Android.mk
@@ -29,6 +29,7 @@ LOCAL_MODULE 			:= aacdecoder
 LOCAL_SRC_FILES 		:= aac-decoder.c
 LOCAL_CFLAGS 			:= $(cflags_loglevels)
 LOCAL_LDLIBS 			:= -llog
+LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
 LOCAL_STATIC_LIBRARIES 	:= decoder-opencore-aacdec decoder-opencore-mp3dec libpv_aac_dec libpv_mp3_dec
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/decoder/jni/opencore-aacdec/Android.mk b/decoder/jni/opencore-aacdec/Android.mk
index ca3e93c..1f21b73 100644
--- a/decoder/jni/opencore-aacdec/Android.mk
+++ b/decoder/jni/opencore-aacdec/Android.mk
@@ -43,7 +43,6 @@ LOCAL_SRC_FILES := \
  	src/get_adif_header.cpp \
  	src/get_adts_header.cpp \
  	src/get_audio_specific_config.cpp \
- 	src/get_cce.cpp \
  	src/get_dse.cpp \
  	src/get_ele_list.cpp \
  	src/get_ga_specific_config.cpp \
@@ -175,7 +174,7 @@ PV_CFLAGS :=
 # Unfortunately PS causes crash for certain streams:
 # fixed 2012-06-28
 #LOCAL_CFLAGS := -DAAC_PLUS -DHQ_SBR $(PV_CFLAGS)
-LOCAL_CFLAGS := -DAAC_PLUS -DHQ_SBR -DPARAMETRICSTEREO $(PV_CFLAGS)
+LOCAL_CFLAGS := -Wno-narrowing -DAAC_PLUS -DHQ_SBR -DPARAMETRICSTEREO $(PV_CFLAGS)
 
 ifeq ($(TARGET_ARCH),arm)
 	LOCAL_ARM_MODE := arm