Merge WebKit at r68651 : No prelinking after merge

WebKit has grown during the merge, and doesn't fit in the prelink map anymore

Reopened http://b/issue?id=2917906 to track this

Change-Id: I40fb143a25a0637cd2c9359331576acb5a1c1fba

diff --git a/Android.mk b/Android.mk
index 311661f..d0a1813 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -429,7 +429,7 @@ endif  # JAVASCRIPT_ENGINE == jsc
 # will strip out any unused code from the entry point.
 include $(CLEAR_VARS)
 # if you need to make webcore huge (for debugging), enable this line
-#LOCAL_PRELINK_MODULE := false
+LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libwebcore
 LOCAL_LDLIBS := $(WEBKIT_LDLIBS)
 LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES)