diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-12 12:15:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-12 12:15:07 -0700 |
| commit | 63b96e48deb0a4c5b594693922bd9101ffc3ef93 (patch) | |
| tree | f4e64e5c62746d337a1b1de063a57c50c9fa3b62 /drm | |
| parent | a5a0cea84cdf116f4de4f812c26be73e70a260e6 (diff) | |
| parent | 5e0067b486c3862316aa1f293cf9690c0cf54bda (diff) | |
| download | frameworks_av-63b96e48deb0a4c5b594693922bd9101ffc3ef93.zip frameworks_av-63b96e48deb0a4c5b594693922bd9101ffc3ef93.tar.gz frameworks_av-63b96e48deb0a4c5b594693922bd9101ffc3ef93.tar.bz2 | |
Merge "Remove the simulator target from all makefiles. Bug: 5010576"
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/drmserver/Android.mk | 9 | ||||
| -rw-r--r-- | drm/libdrmframework/Android.mk | 9 | ||||
| -rw-r--r-- | drm/libdrmframework/plugins/passthru/Android.mk | 10 |
3 files changed, 6 insertions, 22 deletions
diff --git a/drm/drmserver/Android.mk b/drm/drmserver/Android.mk index e3cd44f..fd417cb 100644 --- a/drm/drmserver/Android.mk +++ b/drm/drmserver/Android.mk @@ -24,13 +24,8 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libmedia \ libutils \ - libbinder - -ifeq ($(TARGET_SIMULATOR),true) - LOCAL_LDLIBS += -ldl -else - LOCAL_SHARED_LIBRARIES += libdl -endif + libbinder \ + libdl LOCAL_STATIC_LIBRARIES := libdrmframeworkcommon diff --git a/drm/libdrmframework/Android.mk b/drm/libdrmframework/Android.mk index f1526a4..c534402 100644 --- a/drm/libdrmframework/Android.mk +++ b/drm/libdrmframework/Android.mk @@ -25,13 +25,8 @@ LOCAL_MODULE:= libdrmframework LOCAL_SHARED_LIBRARIES := \ libutils \ - libbinder - -ifeq ($(TARGET_SIMULATOR),true) - LOCAL_LDLIBS += -ldl -else - LOCAL_SHARED_LIBRARIES += libdl -endif + libbinder \ + libdl LOCAL_STATIC_LIBRARIES := \ libdrmframeworkcommon diff --git a/drm/libdrmframework/plugins/passthru/Android.mk b/drm/libdrmframework/plugins/passthru/Android.mk index be18b64..d0d1439 100644 --- a/drm/libdrmframework/plugins/passthru/Android.mk +++ b/drm/libdrmframework/plugins/passthru/Android.mk @@ -24,14 +24,8 @@ LOCAL_MODULE := libdrmpassthruplugin LOCAL_STATIC_LIBRARIES := libdrmframeworkcommon LOCAL_SHARED_LIBRARIES := \ - libutils - -ifeq ($(TARGET_SIMULATOR),true) - LOCAL_LDLIBS += -ldl -else - LOCAL_SHARED_LIBRARIES += libdl -endif - + libutils \ + libdl LOCAL_C_INCLUDES += \ |