Remove indirection of cpufeatures.gypi.

Now that android_webview_build is no longer supported, the extra level
of indirection of including cpufeatures.gypi instead of directly
depending on the cpufeatures target is not necessary. Remove the cases
in the Chromium tree. Other references appear in projects pulled in via
DEPS that will have to be fixed separately before cpufeatures.gypi can
be entirely deleted.

BUG=440793

Review URL: https://codereview.chromium.org/1045123005

Cr-Commit-Position: refs/heads/master@{#324117}

base/base.gyp

@@ -105,6 +105,7 @@
           'dependencies': [
             'base_java',
             'base_jni_headers',
+            '../build/android/ndk.gyp:cpu_features',
             '../third_party/ashmem/ashmem.gyp:ashmem',
           ],
           'link_settings': {
@@ -115,9 +116,6 @@
           'sources!': [
             'debug/stack_trace_posix.cc',
           ],
-          'includes': [
-            '../build/android/cpufeatures.gypi',
-          ],
         }],
         ['os_bsd==1', {
           'include_dirs': [

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',
   ],
 }

build/secondary/third_party/android_tools/BUILD.gn

@@ -9,7 +9,7 @@ config("cpu_features_include") {
 }
 
 # This is the GN version of
-# //build/android/cpufeatures.gypi:cpufeatures
+# //build/android/ndk.gyp:cpu_features
 source_set("cpu_features") {
   sources = [
     "ndk/sources/android/cpufeatures/cpu-features.c",

content/content_app.gypi

@@ -50,12 +50,10 @@
       ],
       'dependencies': [
         'content.gyp:content_jni_headers',
+        '../build/android/ndk.gyp:cpu_features',
         '../skia/skia.gyp:skia',
         '../ui/android/ui_android.gyp:ui_android',
       ],
-      'includes': [
-        '../build/android/cpufeatures.gypi',
-      ],
     }],
     ['OS=="win"', {
       'dependencies': [

content/content_child.gypi

@@ -361,8 +361,8 @@
       }
     ],
     ['OS=="android"', {
-      'includes': [
-        '../build/android/cpufeatures.gypi',
+      'dependencies': [
+        '../build/android/ndk.gyp:cpu_features',
       ],
     }],
     ['enable_plugins==0', {

content/content_renderer.gypi

@@ -764,11 +764,9 @@
         'renderer/external_popup_menu.h',
       ],
       'dependencies': [
+        '../build/android/ndk.gyp:cpu_features',
         '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
       ],
-      'includes': [
-        '../build/android/cpufeatures.gypi',
-      ],
     }, {
       'sources!': [
         'renderer/java/gin_java_bridge_dispatcher.cc',

crypto/crypto.gyp

@@ -49,9 +49,9 @@
           ],
         }],
         [ 'OS == "android"', {
-            'includes': [
-              '../build/android/cpufeatures.gypi',
-            ],
+          'dependencies': [
+            '../build/android/ndk.gyp:cpu_features',
+          ],
         }],
         [ 'os_bsd==1', {
           'link_settings': {

skia/skia_library.gypi

@@ -210,8 +210,8 @@
       'sources': [
         '../third_party/skia/src/core/SkUtilsArm.cpp',
       ],
-      'includes': [
-        '../build/android/cpufeatures.gypi',
+      'dependencies': [
+        '../build/android/ndk.gyp:cpu_features',
       ],
     }],
     [ 'desktop_linux == 1 or chromeos == 1', {

third_party/libwebp/libwebp.gyp

@@ -61,7 +61,7 @@
       ],
       'conditions': [
         ['OS == "android"', {
-          'includes': [ '../../build/android/cpufeatures.gypi' ],
+          'dependencies': [ '../../build/android/ndk.gyp:cpu_features' ],
         }],
         ['order_profiling != 0', {
           'target_conditions' : [