Fix master-gpl build.

Turn off prelinking of libwebcore. This has no effect in the master
branch where the prelinker no longer exists, but will disable
prelinking in the master-gpl branch and fix the build as libwebcore
has grown in size with the last merge (to r80534).

Change-Id: Id42fca910b4c6604fe127904c7e8704cc62cd768

diff --git a/Android.mk b/Android.mk
index f79cb95..fb3a06d 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -461,7 +461,10 @@ endif  # JAVASCRIPT_ENGINE == jsc
 # Now build the shared library using only the exported jni entry point. This
 # 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
+# Do not attempt prelink this library. Needed to keep master-gpl happy, no
+# effect in master.
+# TODO: remove this when master-gpl is updated.
+LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libwebcore
 LOCAL_LDLIBS := $(WEBKIT_LDLIBS)
 LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES)