Remove android_webview_build conditions.

libvpx.gyp

 # Copyright (c) 2012 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': {
     'libvpx_build_vp9%': 1,
     'libvpx_source%': 'source/libvpx',
     # Disable LTO for neon targets
     # crbug.com/408997
     'use_lto%': 0,
@@ skipping 275 matching lines @@
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(libvpx_source)',
             ],
           },
           # We need to explicitly tell the assembler to look for
           # .include directive files from the place where they're
           # generated to.
           'cflags': [
-             '-Wa,-I,<(shared_generated_dir)',
+            '-Wa,-I,<(shared_generated_dir)',
+            '-Wa,-I,<!(pwd)/source/config/<(OS_CATEGORY)/<(target_arch_full)',
+            '-Wa,-I,<!(pwd)/source/config',
           ],
           'conditions': [
-            # For Android WebView, the following pathc are not required and not
-            # allowed, because they generate the absolute path.
-            ['android_webview_build!=1', {
-              'cflags': [
-                '-Wa,-I,<!(pwd)/source/config/<(OS_CATEGORY)/<(target_arch_full)',
-                '-Wa,-I,<!(pwd)/source/config',
-              ],
-            }],
             # Libvpx optimizations for ARMv6 or ARMv7 without NEON.
             ['arm_neon==0', {
               'conditions': [
                 ['OS=="android"', {
                   'includes': [
                     'libvpx_srcs_arm_neon_cpu_detect.gypi',
                   ],
                   'dependencies': [
                     'libvpx_intrinsics_neon',
                   ],
                   'cflags': [
                     '-Wa,-mfpu=neon',
                   ],
                 }, {
                   'includes': [
                     'libvpx_srcs_arm.gypi',
                   ],
                 }],
               ],
             }],
             # Libvpx optimizations for ARMv7 with NEON.
             ['arm_neon==1', {
               'includes': [
                 'libvpx_srcs_arm_neon.gypi',
               ],
             }],
             ['OS == "android"', {
-              'includes': [
-                '../../build/android/cpufeatures.gypi',
+              'dependencies': [
+                '../../build/android/ndk.gyp:cpu_features',
               ],
             }],
             ['OS == "ios"', {
               'xcode_settings': {
                 'OTHER_CFLAGS!': [
                   # Breaks at least boolhuff_armv5te:token_high_bit_not_set_ev.
                   '-fstack-protector-all',  # Implies -fstack-protector
                 ],
               },
             }],
           ],
         },
       ],
     }],
   ],
 }