summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-09-10 13:03:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-10 13:03:29 -0700
commit5d3acf9ad4b192cecdd864b4808b6d69befa01e8 (patch)
treeede91795990155a43d59db5a92bd0b56b9654eeb
parente2af4f70b5326d7c55533639844b3a7eaf12e34c (diff)
parenta4f8842d67004f168b53fc684d4622679e19a3df (diff)
downloadframeworks_av-5d3acf9ad4b192cecdd864b4808b6d69befa01e8.zip
frameworks_av-5d3acf9ad4b192cecdd864b4808b6d69befa01e8.tar.gz
frameworks_av-5d3acf9ad4b192cecdd864b4808b6d69befa01e8.tar.bz2
am 7547b8ea: fix build
Merge commit '7547b8eac6a4011683a93f51fdabf5a978e1f18c' into gingerbread-plus-aosp * commit '7547b8eac6a4011683a93f51fdabf5a978e1f18c': fix build
-rw-r--r--drm/drmserver/Android.mk9
1 files changed, 7 insertions, 2 deletions
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_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libutils \
- libbinder \
- libdl
+ libbinder
+
+ifeq ($(TARGET_SIMULATOR),true)
+ LOCAL_LDLIBS += -ldl
+else
+ LOCAL_SHARED_LIBRARIES += libdl
+endif
LOCAL_STATIC_LIBRARIES := libdrmframeworkcommon