diff options
| author | torne <torne@chromium.org> | 2014-09-26 12:05:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-26 19:05:22 +0000 |
| commit | c7f9a36cbad5fa14875e26d704ba89208f7cb40f (patch) | |
| tree | 8db8fd5c6b6c74e126bd10280987cfba7bd462ef | |
| parent | a0f4c7f7b13d30582b3bb2806af7e36f57643514 (diff) | |
| download | chromium_src-c7f9a36cbad5fa14875e26d704ba89208f7cb40f.zip chromium_src-c7f9a36cbad5fa14875e26d704ba89208f7cb40f.tar.gz chromium_src-c7f9a36cbad5fa14875e26d704ba89208f7cb40f.tar.bz2 | |
android_webview: Enable FDO support for some targets.
Enable feedback-directed optimisation for the main library (required to
make the FDO symbols present at link time), skia, and sqlite. Update the
android_exports whitelist to allow the gcov symbols to remain public as
otherwise profiling will fail.
BUG=
TBR=michaeln@chromium.org
Review URL: https://codereview.chromium.org/591153002
Cr-Commit-Position: refs/heads/master@{#296997}
| -rw-r--r-- | android_webview/libwebviewchromium.gypi | 5 | ||||
| -rw-r--r-- | build/android/android_exports.lst | 3 | ||||
| -rw-r--r-- | skia/skia_common.gypi | 7 | ||||
| -rw-r--r-- | third_party/sqlite/sqlite.gyp | 6 |
4 files changed, 20 insertions, 1 deletions
diff --git a/android_webview/libwebviewchromium.gypi b/android_webview/libwebviewchromium.gypi index c3259b3..c6df549 100644 --- a/android_webview/libwebviewchromium.gypi +++ b/android_webview/libwebviewchromium.gypi @@ -31,6 +31,11 @@ '../ui/android/ui_android.gyp:page_transition_types_java', '../ui/android/ui_android.gyp:window_open_disposition_java', ], + # Enable feedback-directed optimisation for the library when building in + # android. + 'aosp_build_settings': { + 'LOCAL_FDO_SUPPORT': 'true', + }, }], [ 'android_webview_build==1 and use_system_skia==0', { # When not using the system skia there are linker warnings about diff --git a/build/android/android_exports.lst b/build/android/android_exports.lst index 820d6ec..6eee232 100644 --- a/build/android/android_exports.lst +++ b/build/android/android_exports.lst @@ -7,8 +7,9 @@ # https://sourceware.org/binutils/docs-2.24/ld/VERSION.html#VERSION { - global: + global: Java_*_native*; JNI_OnLoad; + __gcov_*; local: *; }; diff --git a/skia/skia_common.gypi b/skia/skia_common.gypi index 81b4592..6137352 100644 --- a/skia/skia_common.gypi +++ b/skia/skia_common.gypi @@ -114,6 +114,13 @@ 'SK_ARM_HAS_OPTIONAL_NEON', ], }], + + # Enable feedback-directed optimisation for skia when building in android. + [ 'android_webview_build == 1', { + 'aosp_build_settings': { + 'LOCAL_FDO_SUPPORT': 'true', + }, + }], ], 'variables': { diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp index c1ec3bc..6be9f53 100644 --- a/third_party/sqlite/sqlite.gyp +++ b/third_party/sqlite/sqlite.gyp @@ -161,6 +161,12 @@ '-Wno-pointer-to-int-cast', ], }], + # Enable feedback-directed optimisation for sqlite when building in android. + ['android_webview_build == 1', { + 'aosp_build_settings': { + 'LOCAL_FDO_SUPPORT': 'true', + }, + }], ], }], ], |