diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 14:18:15 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 14:51:10 +0100 |
| commit | 6b864fac938e6226fe95e2352291d3c25eeb12e3 (patch) | |
| tree | a0447dd49917dc83dd5dc77ed34d0dc6fafabf06 /Android.mk | |
| parent | 6d45935b4d405c4f9fc71e9a4b6499268c39a9d9 (diff) | |
| download | external_webkit-6b864fac938e6226fe95e2352291d3c25eeb12e3.zip external_webkit-6b864fac938e6226fe95e2352291d3c25eeb12e3.tar.gz external_webkit-6b864fac938e6226fe95e2352291d3c25eeb12e3.tar.bz2 | |
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
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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) |