| Index: android_webview/android_webview.gyp
|
| diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
|
| index 165399768b5ed87c526ee3f6468f46211e1e2f66..d687e7175984634f0724a310f46e0ce817bc5079 100644
|
| --- a/android_webview/android_webview.gyp
|
| +++ b/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',
|
|
|