From: Ying Wang <wangying@google.com>
Date: Thu, 8 May 2014 20:48:00 +0000 (-0700)
Subject: resolved conflicts for merge of cf79c7a5 to master
X-Git-Tag: android-x86-6.0-r1~2163
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=49f095546d047b52c5070229bbee0c3f27548256;p=android-x86%2Fframeworks-av.git

resolved conflicts for merge of cf79c7a5 to master

Change-Id: Ic4e75541193f733f477cfa4a2a87cce4c9e64f45
---

49f095546d047b52c5070229bbee0c3f27548256
diff --cc media/libeffects/downmix/Android.mk
index 2bb6dbe124,2bb6dbe124..e0ca8af3f7
--- a/media/libeffects/downmix/Android.mk
+++ b/media/libeffects/downmix/Android.mk
@@@ -15,16 -15,16 +15,10 @@@ LOCAL_MODULE_TAGS := optiona
  
  LOCAL_MODULE_RELATIVE_PATH := soundfx
  
--ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
--LOCAL_LDLIBS += -ldl
--endif
--
  LOCAL_C_INCLUDES := \
  	$(call include-path-for, audio-effects) \
  	$(call include-path-for, audio-utils)
  
--LOCAL_PRELINK_MODULE := false
--
  LOCAL_CFLAGS += -fvisibility=hidden
  
  include $(BUILD_SHARED_LIBRARY)
diff --cc media/libeffects/preprocessing/Android.mk
index 9e8cb8314c,9e8cb8314c..ea3c59d2e1
--- a/media/libeffects/preprocessing/Android.mk
+++ b/media/libeffects/preprocessing/Android.mk
@@@ -24,12 -24,12 +24,7 @@@ LOCAL_SHARED_LIBRARIES := 
      libutils \
      liblog
  
--ifeq ($(TARGET_SIMULATOR),true)
--LOCAL_LDLIBS += -ldl
--else
  LOCAL_SHARED_LIBRARIES += libdl
--endif
--
  LOCAL_CFLAGS += -fvisibility=hidden
  
  include $(BUILD_SHARED_LIBRARY)