summaryrefslogtreecommitdiff
path: root/chromium/android_webview
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/android_webview')
-rw-r--r--chromium/android_webview/android_webview.gyp15
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',