diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-09-12 12:10:22 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-09-12 12:10:22 +0100 |
| commit | 58537e28ecd584eab876aee8be7156509866d23a (patch) | |
| tree | 8988984e52090aaadf33cff139d7dd212cd13656 /android_webview/android_webview.gyp | |
| parent | 0a1b11dee8e5cb2520121c300858fea6138e3c54 (diff) | |
| download | chromium_org-58537e28ecd584eab876aee8be7156509866d23a.tar.gz | |
Merge from Chromium at DEPS revision 222756
This commit was generated by merge_to_master.py.
Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
Diffstat (limited to 'android_webview/android_webview.gyp')
| -rw-r--r-- | android_webview/android_webview.gyp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 165399768b..d687e71759 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', |