Android WebView: tidy up library dependencies.

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',
       ],
       'ldflags': [
         # fix linking to hidden symbols and re-enable this (crbug.com/157326)
         '-Wl,--no-fatal-warnings'
       ],
       'sources': [
         'lib/main/webview_entry_point.cc',
       ],
-      'conditions': [
-        ['android_webview_build == 1', {
-          'libraries': [
-            # The "android" gyp backend doesn't quite handle static libraries'
-            # dependencies correctly; force this to be linked as a workaround.
-            'cpufeatures.a',
-            '-lcutils',
-          ],
-        }],
-      ],
     },
     {
       'target_name': 'android_webview_pak',
       'type': 'none',
       'dependencies': [
         '<(DEPTH)/content/browser/devtools/devtools_resources.gyp:devtools_resources',
         '<(DEPTH)/content/content_resources.gyp:content_resources',
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
@@ skipping 155 matching lines @@
         '../content/content.gyp:content_java',
         '../ui/ui.gyp:ui_java',
       ],
       'variables': {
         'java_in_dir': '../android_webview/java',
       },
       'includes': [ '../build/java.gypi' ],
     },
   ],
 }