diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-11-16 14:35:33 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-16 19:27:41 -0800 |
| commit | 842f7df253913a11b6dbc705b83299c437edd4e3 (patch) | |
| tree | 6cb7da0af2b2b7254d8e43c454cb881dfa15f206 /media/libstagefright/Android.mk | |
| parent | 8ab5ff0b3709976cde09362e7444d78d0a981dd3 (diff) | |
| parent | 60282213a1194ee8753ac53b97fc7f7e36373e17 (diff) | |
| download | frameworks_av-842f7df253913a11b6dbc705b83299c437edd4e3.zip frameworks_av-842f7df253913a11b6dbc705b83299c437edd4e3.tar.gz frameworks_av-842f7df253913a11b6dbc705b83299c437edd4e3.tar.bz2 | |
Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/platform/frameworks/av into cm-13.0
Change-Id: Ia41df61c3ccfeb809572b63a4b1a8ca6bd85dfb2
Diffstat (limited to 'media/libstagefright/Android.mk')
| -rw-r--r-- | media/libstagefright/Android.mk | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 6c37819..5a75269 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -156,6 +156,11 @@ LOCAL_SHARED_LIBRARIES += \ LOCAL_CFLAGS += -Wno-multichar -Werror -Wno-error=deprecated-declarations -Wall +ifeq ($(TARGET_USES_QCOM_BSP), true) + LOCAL_C_INCLUDES += $(call project-path-for,qcom-display)/libgralloc + LOCAL_CFLAGS += -DQTI_BSP +endif + # enable experiments only in userdebug and eng builds ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) LOCAL_CFLAGS += -DENABLE_STAGEFRIGHT_EXPERIMENTS @@ -165,6 +170,12 @@ ifeq ($(TARGET_BOARD_PLATFORM),omap4) LOCAL_CFLAGS += -DBOARD_CANT_REALLOCATE_OMX_BUFFERS endif +ifeq ($(call is-vendor-board-platform,QCOM),true) +ifeq ($(strip $(AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER)),true) + LOCAL_CFLAGS += -DQTI_FLAC_DECODER +endif +endif + LOCAL_CLANG := true ifeq ($(BOARD_USE_SAMSUNG_CAMERAFORMAT_NV21), true) |