diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-10 15:00:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 15:00:12 -0700 |
| commit | 033531f83043a658d4b43a0ee231446a4c89e66c (patch) | |
| tree | 69cfc0d4704e723c413a20ca2686bb7c3dc66340 | |
| parent | a0d472f114bb6a74005aaf61e91e3569ae061630 (diff) | |
| parent | 5d3acf9ad4b192cecdd864b4808b6d69befa01e8 (diff) | |
| download | frameworks_av-033531f83043a658d4b43a0ee231446a4c89e66c.zip frameworks_av-033531f83043a658d4b43a0ee231446a4c89e66c.tar.gz frameworks_av-033531f83043a658d4b43a0ee231446a4c89e66c.tar.bz2 | |
am 3b3d2160: am 7547b8ea: fix build
Merge commit '3b3d2160b7c8a17f44476d34408296264d57f2cc'
* commit '3b3d2160b7c8a17f44476d34408296264d57f2cc':
fix build
| -rw-r--r-- | drm/drmserver/Android.mk | 9 |
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 |