From d417c93c1046db5726df85ef2f974a5069e31180 Mon Sep 17 00:00:00 2001
From: Richard Coles <torne@chromium.org>
Date: Thu, 9 Apr 2015 17:36:12 +0200
Subject: [PATCH] Remove android_webview_build conditions.

Now that android_webview_build is no longer supported, remove build
conditionals referencing it and also remove the extra level of
indirection used to reference the cpufeatures target.

BUG=chromium:440793
R=henrika@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/44119005

Patch from Richard Coles <torne@chromium.org>.

Cr-Commit-Position: refs/heads/master@{#8963}
---
 webrtc/build/common.gypi                              | 2 +-
 webrtc/common_audio/common_audio.gyp                  | 2 +-
 webrtc/modules/audio_coding/codecs/isac/isacfix.gypi  | 2 +-
 webrtc/modules/audio_processing/audio_processing.gypi | 4 ++--
 webrtc/system_wrappers/BUILD.gn                       | 7 +------
 webrtc/system_wrappers/cpu_features_chromium.gyp      | 4 ++--
 webrtc/system_wrappers/cpu_features_webrtc.gyp        | 4 ++--
 7 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index 3c3a94dee3..cf1ffe1356 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -285,7 +285,7 @@
           }],
         ],
       }],
-      ['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', {
+      ['target_arch=="mipsel" and mips_arch_variant!="r6"', {
         'defines': [
           'MIPS32_LE',
         ],
diff --git a/webrtc/common_audio/common_audio.gyp b/webrtc/common_audio/common_audio.gyp
index e28f4b03ff..c7a4870131 100644
--- a/webrtc/common_audio/common_audio.gyp
+++ b/webrtc/common_audio/common_audio.gyp
@@ -158,7 +158,7 @@
         ['target_arch=="arm64"', {
           'dependencies': ['common_audio_neon',],
         }],
-        ['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', {
+        ['target_arch=="mipsel" and mips_arch_variant!="r6"', {
           'sources': [
             'signal_processing/include/spl_inl_mips.h',
             'signal_processing/complex_bit_reverse_mips.c',
diff --git a/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi b/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi
index a6a7f97775..de5ada6e1d 100644
--- a/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi
+++ b/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi
@@ -95,7 +95,7 @@
             }],
           ],
         }],
-        ['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', {
+        ['target_arch=="mipsel" and mips_arch_variant!="r6"', {
           'sources': [
             'fix/source/entropy_coding_mips.c',
             'fix/source/filters_mips.c',
diff --git a/webrtc/modules/audio_processing/audio_processing.gypi b/webrtc/modules/audio_processing/audio_processing.gypi
index 3ceeed8a0c..c10ee78308 100644
--- a/webrtc/modules/audio_processing/audio_processing.gypi
+++ b/webrtc/modules/audio_processing/audio_processing.gypi
@@ -156,7 +156,7 @@
             'ns/nsx_defines.h',
           ],
           'conditions': [
-            ['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', {
+            ['target_arch=="mipsel" and mips_arch_variant!="r6"', {
               'sources': [
                 'ns/nsx_core_mips.c',
               ],
@@ -183,7 +183,7 @@
         ['(target_arch=="arm" and arm_version>=7) or target_arch=="arm64"', {
           'dependencies': ['audio_processing_neon',],
         }],
-        ['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', {
+        ['target_arch=="mipsel" and mips_arch_variant!="r6"', {
           'sources': [
             'aecm/aecm_core_mips.c',
           ],
diff --git a/webrtc/system_wrappers/BUILD.gn b/webrtc/system_wrappers/BUILD.gn
index f0c0ffa9cb..b9d93a6b09 100644
--- a/webrtc/system_wrappers/BUILD.gn
+++ b/webrtc/system_wrappers/BUILD.gn
@@ -224,11 +224,6 @@ if (is_android) {
 
     configs += [ "..:common_config" ]
     public_configs = [ "..:common_inherited_config" ]
-
-    if (is_android_webview_build) {
-      libs += [ "cpufeatures.a" ]
-    } else {
-      deps = [ "//third_party/android_tools:cpu_features" ]
-    }
+    deps = [ "//third_party/android_tools:cpu_features" ]
   }
 }
diff --git a/webrtc/system_wrappers/cpu_features_chromium.gyp b/webrtc/system_wrappers/cpu_features_chromium.gyp
index 96bb6d9c60..519fe44119 100644
--- a/webrtc/system_wrappers/cpu_features_chromium.gyp
+++ b/webrtc/system_wrappers/cpu_features_chromium.gyp
@@ -16,8 +16,8 @@
           'sources': [
             'source/cpu_features_android.c',
           ],
-          'includes': [
-            '../../../build/android/cpufeatures.gypi',
+          'dependencies': [
+            '../../../build/android/ndk.gyp:cpu_features',
           ],
         },
       ],
diff --git a/webrtc/system_wrappers/cpu_features_webrtc.gyp b/webrtc/system_wrappers/cpu_features_webrtc.gyp
index c7ce4dc51b..064b3cf049 100644
--- a/webrtc/system_wrappers/cpu_features_webrtc.gyp
+++ b/webrtc/system_wrappers/cpu_features_webrtc.gyp
@@ -16,8 +16,8 @@
           'sources': [
             'source/cpu_features_android.c',
           ],
-          'includes': [
-            '../../build/android/cpufeatures.gypi',
+          'dependencies': [
+            '../../build/android/ndk.gyp:cpu_features',
           ],
         },
       ],