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 | bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e (patch) | |
| tree | b17fbae7a6ff475ab37be48046d0540d594f84fb /drm | |
| parent | 3f9dd287b99340efaaa257759e71a8f81b2ed113 (diff) | |
| download | frameworks_base-bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e.zip frameworks_base-bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e.tar.gz frameworks_base-bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e.tar.bz2 | |
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/jni/Android.mk | 9 | ||||
| -rw-r--r-- | drm/libdrmframework/Android.mk | 9 | ||||
| -rw-r--r-- | drm/libdrmframework/plugins/passthru/Android.mk | 10 |
4 files changed, 8 insertions, 29 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/jni/Android.mk b/drm/jni/Android.mk index 69bb48d..4a55fc0 100644 --- a/drm/jni/Android.mk +++ b/drm/jni/Android.mk @@ -26,13 +26,8 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libandroid_runtime \ libnativehelper \ - libbinder - -ifeq ($(TARGET_SIMULATOR),true) - LOCAL_LDLIBS += -ldl -else - LOCAL_SHARED_LIBRARIES += libdl -endif + libbinder \ + libdl LOCAL_STATIC_LIBRARIES := 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 += \ |