Android WebView: re-enable linker warnings where possible.

android_webview/android_webview.gyp

 # Copyright 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'android_webview_tests.gypi',
   ],
   'targets': [
     {
       'target_name': 'libwebviewchromium',
       'type': 'shared_library',
       'android_unmangled_name': 1,
       'dependencies': [
         'android_webview_common',
       ],
       'conditions': [
         # The general approach is to allow the executable target to choose
         # the allocator, but as in the WebView case we are building a library
         # only, put the dependency on the allocator here
         [ 'android_webview_build==1 and android_use_tcmalloc==1', {
           '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',
       ],
     },
     {
       'target_name': 'android_webview_pak',
       'type': 'none',
       'dependencies': [
         '<(DEPTH)/content/content_resources.gyp:content_resources',
@@ skipping 157 matching lines @@
         '../content/content.gyp:content_java',
         '../ui/ui.gyp:ui_java',
       ],
       'variables': {
         'java_in_dir': '../android_webview/java',
       },
       'includes': [ '../build/java.gypi' ],
     },
   ],
 }