commit cc24f76ca5e8c987920d819c399c3eca11432f17
author Jean-Michel Trivi <jmtrivi@google.com> Fri Sep 10 15:06:38 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 10 15:06:38 2010 -0700
tree 8ed898524508a1d1bf6b4b2317a3734ff28b72ea
parent f53873d41edcbe7b2893dd0dd9f35c61850f0316
parent 1a02fabca518806222212bdc708b36a37a7c3925

Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base

drm/drmserver/Android.mk

diff --git a/drm/drmserver/Android.mk b/drm/drmserver/Android.mk
index d2ebe8e..46a51bc 100644
--- a/drm/drmserver/Android.mk
+++ b/drm/drmserver/Android.mk
@@ -24,8 +24,13 @@
 
 LOCAL_SHARED_LIBRARIES := \
     libutils \
-    libbinder \
-    libdl
+    libbinder
+
+ifeq ($(TARGET_SIMULATOR),true)
+ LOCAL_LDLIBS += -ldl
+else
+ LOCAL_SHARED_LIBRARIES += libdl
+endif
 
 LOCAL_STATIC_LIBRARIES := libdrmframeworkcommon
 

drm/libdrmframework/Android.mk

diff --git a/drm/libdrmframework/Android.mk b/drm/libdrmframework/Android.mk
index c25d79b..765adba 100644
--- a/drm/libdrmframework/Android.mk
+++ b/drm/libdrmframework/Android.mk
@@ -25,8 +25,13 @@
 
 LOCAL_SHARED_LIBRARIES := \
     libutils \
-    libbinder \
-    libdl
+    libbinder
+
+ifeq ($(TARGET_SIMULATOR),true)
+ LOCAL_LDLIBS += -ldl
+else
+ LOCAL_SHARED_LIBRARIES += libdl
+endif
 
 LOCAL_STATIC_LIBRARIES := \
     libdrmframeworkcommon

drm/libdrmframework/plugins/passthru/Android.mk

diff --git a/drm/libdrmframework/plugins/passthru/Android.mk b/drm/libdrmframework/plugins/passthru/Android.mk
index a7bbf23..169b89b 100644
--- a/drm/libdrmframework/plugins/passthru/Android.mk
+++ b/drm/libdrmframework/plugins/passthru/Android.mk
@@ -24,8 +24,13 @@
 LOCAL_STATIC_LIBRARIES := libdrmframeworkcommon
 
 LOCAL_SHARED_LIBRARIES := \
-    libutils \
-    libdl
+    libutils
+
+ifeq ($(TARGET_SIMULATOR),true)
+ LOCAL_LDLIBS += -ldl
+else
+ LOCAL_SHARED_LIBRARIES += libdl
+endif
 
 LOCAL_PRELINK_MODULE := false