From a5f28cef4ec9a50108428b55e87d4045aa5a1458 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Wed, 6 Feb 2013 13:06:47 +0100
Subject: Fix mako build.

Change-Id: Ic73cb2f4152ac77a83fcda7e89b4a8202df440c6
---
 media/libstagefright/Android.mk              | 13 ++++++-------
 media/libstagefright/include/AwesomePlayer.h |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'media/libstagefright')

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
-- 
cgit v1.1