commit 4f168c7cfdab0389f0808ca5a6b42953a2079f1d
author Dmitriy Ivanov <dimitry@google.com> Tue Dec 09 23:38:54 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 09 23:38:54 2014 +0000
tree de99515643bacdb46fc88bd647dc284caf602c19
parent 1d3b763922cfa97a2184f93bef97b157c49df331
parent 78c958113985f64866c94daba3f1cbe430cdfb8c

am 78c95811: Merge "Remove checks for TARGET_SIMULATOR"

* commit '78c958113985f64866c94daba3f1cbe430cdfb8c':
  Remove checks for TARGET_SIMULATOR

legacy/alsa_sound/Android.mk

diff --git a/legacy/alsa_sound/Android.mk b/legacy/alsa_sound/Android.mk
index 534dd6a..85d80de 100644
--- a/legacy/alsa_sound/Android.mk
+++ b/legacy/alsa_sound/Android.mk
@@ -45,11 +45,7 @@
     libpower    \
     libalsa-intf
 
-ifeq ($(TARGET_SIMULATOR),true)
- LOCAL_LDLIBS += -ldl
-else
- LOCAL_SHARED_LIBRARIES += libdl
-endif
+LOCAL_SHARED_LIBRARIES += libdl
 
 LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa
 LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/libalsa-intf
@@ -128,11 +124,7 @@
     liblog    \
     libalsa-intf
 
-ifeq ($(TARGET_SIMULATOR),true)
- LOCAL_LDLIBS += -ldl
-else
- LOCAL_SHARED_LIBRARIES += libdl
-endif
+LOCAL_SHARED_LIBRARIES += libdl
 
 LOCAL_MODULE:= alsa.msm8960
 LOCAL_MODULE_TAGS := optional

legacy/libalsa-intf/Android.mk

diff --git a/legacy/libalsa-intf/Android.mk b/legacy/libalsa-intf/Android.mk
index 5d509b3..20b0293 100644
--- a/legacy/libalsa-intf/Android.mk
+++ b/legacy/libalsa-intf/Android.mk
@@ -44,11 +44,7 @@
 LOCAL_SHARED_LIBRARIES:= libc libcutils #libutils #libmedia libhardware_legacy
 LOCAL_CFLAGS := -DQC_PROP -DCONFIG_DIR=\"/system/etc/snd_soc_msm/\"
 
-ifeq ($(TARGET_SIMULATOR),true)
- LOCAL_LDLIBS += -ldl
-else
- LOCAL_SHARED_LIBRARIES += libdl
-endif
+LOCAL_SHARED_LIBRARIES += libdl
 LOCAL_PRELINK_MODULE := false
 include $(BUILD_SHARED_LIBRARY)
 endif