Remove indirection of cpufeatures.gypi.

build/android/cpufeatures.gypi

Index: build/android/cpufeatures.gypi
diff --git a/build/android/cpufeatures.gypi b/build/android/cpufeatures.gypi
index b7b0b5303dc5ec1cc2e2cf07224ea6f83597b2c8..672ff1f3d058123b52e378b09ab89c4b684431b2 100644
--- a/build/android/cpufeatures.gypi
+++ b/build/android/cpufeatures.gypi
@@ -2,30 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# Depend on the Android NDK's cpu feature detection. The WebView build is part
-# of the system and the library already exists; for the normal build there is a
-# gyp file in the checked-in NDK to build it.
+# Depend on the Android NDK's cpu feature detection. This additional level of
+# abstraction is no longer necessary and targets can depend directly on
+# build/android/ndk.gyp:cpu_features instead.
+# TODO(torne): delete this once all DEPS have been rolled to not use it.
+# http://crbug.com/440793
 {
-  'conditions': [
-    ['android_webview_build == 1', {
-      # This is specified twice intentionally: Android provides include paths
-      # to targets automatically if they depend on libraries, so we add this
-      # library to every target that includes this .gypi to make the headers
-      # available, then also add it to targets that link those targets via
-      # link_settings to ensure it ends up being linked even if the main target
-      # doesn't include this .gypi.
-      'libraries': [
-        'cpufeatures.a',
-      ],
-      'link_settings': {
-        'libraries': [
-          'cpufeatures.a',
-        ],
-      },
-    }, {
-      'dependencies': [
-        '<(DEPTH)/build/android/ndk.gyp:cpu_features',
-      ],
-    }],
+  'dependencies': [
+    '<(DEPTH)/build/android/ndk.gyp:cpu_features',
   ],
 }