commit c73d12f67a1c115be59f4d84505d72883d416631
author Iliyan Malchev <malchev@google.com> Mon Mar 14 14:02:05 2011 -0700
committer Iliyan Malchev <malchev@google.com> Mon Mar 14 15:36:34 2011 -0700
tree 4ab9de5d289dd894408fcd22341a257e08d3213d
parent ce52ba385f7f84cd47fdf004640de8f53181114d

dalvik: remove LOCAL_PRELINK_MODULE

Change-Id: I1d5652a0380138dc6cddd9f0ba926ff7a131d44b
Signed-off-by: Iliyan Malchev <malchev@google.com>

vm/Android.mk

diff --git a/vm/Android.mk b/vm/Android.mk
index aa04655..516ca25 100644
--- a/vm/Android.mk
+++ b/vm/Android.mk
@@ -43,11 +43,6 @@
 include $(LOCAL_PATH)/ReconfigureDvm.mk
 
 # Overwrite default settings
-ifneq ($(TARGET_ARCH),x86)
-ifneq ($(TARGET_SIMULATOR),true)
-    LOCAL_PRELINK_MODULE := true
-endif
-endif
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libdvm
 LOCAL_CFLAGS += $(target_smp_flag)

vm/ReconfigureDvm.mk

diff --git a/vm/ReconfigureDvm.mk b/vm/ReconfigureDvm.mk
index 13138f8..aada6fe 100644
--- a/vm/ReconfigureDvm.mk
+++ b/vm/ReconfigureDvm.mk
@@ -29,8 +29,5 @@
 
 LOCAL_STATIC_LIBRARIES += libdex
 
-# Don't prelink by default
-LOCAL_PRELINK_MODULE := false
-
 # Don't install on any build by default
 LOCAL_MODULE_TAGS := optional