diff options
author | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:16 -0700 |
---|---|---|
committer | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:16 -0700 |
commit | 5e0067b486c3862316aa1f293cf9690c0cf54bda (patch) | |
tree | 104ac8491b40d6e9d8353322792fb83ce76f4c82 /drm | |
parent | 52f556b976a9caceee183d8af2118ddbee02c70a (diff) |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
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 e3cd44f7..fd417cb9 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 f1526a41..c534402e 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 be18b640..d0d1439b 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 += \ |