diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-21 14:09:57 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 15:14:36 +0100 |
| commit | eb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch) | |
| tree | 2c7c940e1dbee81b89d935626110816b494aa32c /chromium/android_webview | |
| parent | 9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff) | |
| download | qtwebengine-chromium-eb32ba6f51d0c21d58cd7d89785285ff8fa64624.tar.gz | |
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/android_webview')
| -rw-r--r-- | chromium/android_webview/android_webview.gyp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/chromium/android_webview/android_webview.gyp b/chromium/android_webview/android_webview.gyp index 165399768b5..d687e717598 100644 --- a/chromium/android_webview/android_webview.gyp +++ b/chromium/android_webview/android_webview.gyp @@ -24,10 +24,17 @@ 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], }], - ], - 'ldflags': [ - # fix linking to hidden symbols and re-enable this (crbug.com/157326) - '-Wl,--no-fatal-warnings' + [ 'android_webview_build==1 and use_system_skia==0', { + # When not using the system skia there are linker warnings about + # overriden hidden symbols which there's no easy way to eliminate; + # disable them. http://crbug.com/157326 + 'ldflags': [ + '-Wl,--no-fatal-warnings', + ], + 'ldflags!': [ + '-Wl,--fatal-warnings', + ], + }], ], 'sources': [ 'lib/main/webview_entry_point.cc', |