From eb32ba6f51d0c21d58cd7d89785285ff8fa64624 Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Thu, 21 Nov 2013 14:09:57 +0100 Subject: Update chromium to branch 1599. Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb Reviewed-by: Andras Becsi --- chromium/android_webview/android_webview.gyp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'chromium/android_webview') 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', -- cgit v1.2.1