commit d9a4783985203c759ddcca784798ef395668fe05
author Eric Laurent <elaurent@google.com> Fri Feb 07 17:03:31 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 07 17:03:32 2014 +0000
tree 69faaa1bffd16d23216630c04c80ae42a23dba9f
parent c9583cba9913682e1c181675c6d0066292fb719d
parent 7844f679be8d94c5cdf017f53754cb68ee2f00da

Merge "AudioFlinger: Modify flush handling for offload path"

media/libstagefright/http/Android.mk

diff --git a/media/libstagefright/http/Android.mk b/media/libstagefright/http/Android.mk
index baef9ab..a6b481f 100644
--- a/media/libstagefright/http/Android.mk
+++ b/media/libstagefright/http/Android.mk
@@ -1,5 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
 
+ifneq ($(TARGET_BUILD_PDK), true)
+
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:=       \
@@ -20,3 +22,5 @@
 LOCAL_CFLAGS += -Wno-multichar
 
 include $(BUILD_SHARED_LIBRARY)
+
+endif

services/audioflinger/Threads.h

diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h
index 19289d2..4deea9a 100644
--- a/services/audioflinger/Threads.h
+++ b/services/audioflinger/Threads.h
@@ -65,7 +65,7 @@
     class IoConfigEvent : public ConfigEvent {
     public:
         IoConfigEvent(int event, int param) :
-            ConfigEvent(CFG_EVENT_IO), mEvent(event), mParam(event) {}
+            ConfigEvent(CFG_EVENT_IO), mEvent(event), mParam(param) {}
         virtual ~IoConfigEvent() {}
 
                 int event() const { return mEvent; }