summaryrefslogtreecommitdiffstats
path: root/media/libavextensions/Android.mk
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-12-14 01:24:54 -0800
committerSteve Kondik <steve@cyngn.com>2015-12-14 01:24:54 -0800
commit0145bf600a8f5fa911170f8bb8c2ff6fec47a599 (patch)
tree85075538440df5773184773fd946e507dc35c009 /media/libavextensions/Android.mk
parent1512587eb162be68b62161371a4ad1ce81b5377b (diff)
downloadframeworks_av-0145bf600a8f5fa911170f8bb8c2ff6fec47a599.zip
frameworks_av-0145bf600a8f5fa911170f8bb8c2ff6fec47a599.tar.gz
frameworks_av-0145bf600a8f5fa911170f8bb8c2ff6fec47a599.tar.bz2
stagefright: Additional fixes for extended offload support
* Fix compilation with debug enabled * Allow FLAC offload to be enabled independent of QCOM_HARDWARE, tested with the Nexus 5X and is working! * Disable the FLACExtractor if offload is enabled since it can only output decoded PCM. This will force FFMPEG to be used, which does everything we need for FLAC offload Change-Id: I7d71c153a6a6ea7df8e32bc73f5cbe9f51cdcf64
Diffstat (limited to 'media/libavextensions/Android.mk')
-rw-r--r--media/libavextensions/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libavextensions/Android.mk b/media/libavextensions/Android.mk
index 8099ad4..68c36d8 100644
--- a/media/libavextensions/Android.mk
+++ b/media/libavextensions/Android.mk
@@ -17,15 +17,15 @@ LOCAL_C_INCLUDES:= \
LOCAL_CFLAGS += -Wno-multichar -Werror
-ifeq ($(call is-vendor-board-platform,QCOM),true)
LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio
+
ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS),true)
LOCAL_CFLAGS += -DENABLE_AV_ENHANCEMENTS
endif
+
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD)),true)
LOCAL_CFLAGS += -DFLAC_OFFLOAD_ENABLED
endif
-endif
LOCAL_MODULE:= libavextensions
LOCAL_CFLAGS += -DLOG_NDEBUG=0