diff options
| author | Danny Baumann <dannybaumann@web.de> | 2013-02-06 13:06:47 +0100 |
|---|---|---|
| committer | Danny Baumann <dannybaumann@web.de> | 2013-02-06 13:06:47 +0100 |
| commit | a5f28cef4ec9a50108428b55e87d4045aa5a1458 (patch) | |
| tree | 6411a43e5a0fa558cf75578fb8a6c99d64132b6f | |
| parent | 12170a107e7c96170a38dbe43e98447c87624bd7 (diff) | |
| download | frameworks_av-a5f28cef4ec9a50108428b55e87d4045aa5a1458.zip frameworks_av-a5f28cef4ec9a50108428b55e87d4045aa5a1458.tar.gz frameworks_av-a5f28cef4ec9a50108428b55e87d4045aa5a1458.tar.bz2 | |
Fix mako build.
Change-Id: Ic73cb2f4152ac77a83fcda7e89b4a8202df440c6
| -rwxr-xr-x | media/libstagefright/Android.mk | 13 | ||||
| -rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index ea64cc8..e2209ff4 100755 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -1,13 +1,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -ifeq ($(BOARD_USES_ALSA_AUDIO),true) - ifeq ($(call is-chipset-in-board-platform,msm8960),true) - LOCAL_CFLAGS += -DUSE_TUNNEL_MODE - LOCAL_CFLAGS += -DTUNNEL_MODE_SUPPORTS_AMRWB - endif -endif - include frameworks/av/media/libstagefright/codecs/common/Config.mk LOCAL_SRC_FILES:= \ @@ -101,6 +94,12 @@ ifeq ($(TARGET_QCOM_AUDIO_VARIANT),caf) else LOCAL_SRC_FILES += LPAPlayerALSA.cpp endif + ifeq ($(BOARD_USES_ALSA_AUDIO),true) + ifeq ($(call is-chipset-in-board-platform,msm8960),true) + LOCAL_CFLAGS += -DUSE_TUNNEL_MODE + LOCAL_CFLAGS += -DTUNNEL_MODE_SUPPORTS_AMRWB + endif + endif LOCAL_CFLAGS += -DQCOM_ENHANCED_AUDIO LOCAL_SRC_FILES += TunnelPlayer.cpp endif diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index 348f485..ee885a5 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -364,7 +364,7 @@ private: size_t countTracks() const; -#ifdef QCOM_ENHANCED_AUDIO +#ifdef USE_TUNNEL_MODE bool inSupportedTunnelFormats(const char * mime); //Flag to check if tunnel mode audio is enabled |