From 6fae65e5f663b35d5297f21d7c8a73d4249a0299 Mon Sep 17 00:00:00 2001
From: Nico Grunbaum <na-g@nostrum.com>
Date: Wed, 14 Jul 2021 22:26:25 +0000
Subject: [PATCH] Bug 1654112 - deconflate target and current build arch for
 oora; r=mjf

Differential Revision: https://phabricator.services.mozilla.com/D119705
---
 third_party/libwebrtc/common_audio/BUILD.gn      | 16 ++++++++--------
 .../common_audio/third_party/ooura/BUILD.gn      |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/third_party/libwebrtc/common_audio/BUILD.gn b/third_party/libwebrtc/common_audio/BUILD.gn
index ed5636a09e20..08e54dcc8817 100644
--- a/third_party/libwebrtc/common_audio/BUILD.gn
+++ b/third_party/libwebrtc/common_audio/BUILD.gn
@@ -64,7 +64,7 @@ rtc_library("common_audio") {
     deps += [ ":common_audio_neon" ]
   }
 
-  if (current_cpu == "x86" || current_cpu == "x64") {
+  if (target_cpu == "x86" || target_cpu == "x64") {
     deps += [ ":common_audio_sse2" ]
     deps += [ ":common_audio_avx2" ]
   }
@@ -88,7 +88,7 @@ if (rtc_include_tests) {
 rtc_source_set("common_audio_c_arm_asm") {
   sources = []
   deps = []
-  if (current_cpu == "arm") {
+  if (target_cpu == "arm") {
     sources += [ "signal_processing/complex_bit_reverse_arm.S" ]
 
     if (arm_version >= 7) {
@@ -152,7 +152,7 @@ rtc_library("common_audio_c") {
     "vad/webrtc_vad.c",
   ]
 
-  if (current_cpu == "mipsel") {
+  if (target_cpu == "mipsel") {
     sources += [
       "signal_processing/complex_bit_reverse_mips.c",
       "signal_processing/complex_fft_mips.c",
@@ -170,7 +170,7 @@ rtc_library("common_audio_c") {
     sources += [ "signal_processing/complex_fft.c" ]
   }
 
-  if (current_cpu != "arm" && current_cpu != "mipsel") {
+  if (target_cpu != "arm" && target_cpu != "mipsel") {
     sources += [
       "signal_processing/complex_bit_reverse.c",
       "signal_processing/filter_ar_fast_q12.c",
@@ -234,7 +234,7 @@ rtc_library("fir_filter_factory") {
     "../rtc_base/system:arch",
     "../system_wrappers",
   ]
-  if (current_cpu == "x86" || current_cpu == "x64") {
+  if (target_cpu == "x86" || target_cpu == "x64") {
     deps += [ ":common_audio_sse2" ]
     deps += [ ":common_audio_avx2" ]
   }
@@ -243,7 +243,7 @@ rtc_library("fir_filter_factory") {
   }
 }
 
-if (current_cpu == "x86" || current_cpu == "x64") {
+if (target_cpu == "x86" || target_cpu == "x64") {
   rtc_library("common_audio_sse2") {
     sources = [
       "fir_filter_sse.cc",
@@ -294,7 +294,7 @@ if (rtc_build_with_neon) {
       "resampler/sinc_resampler_neon.cc",
     ]
 
-    if (current_cpu != "arm64") {
+    if (target_cpu != "arm64") {
       # Enable compilation for the NEON instruction set.
       suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
       cflags = [ "-mfpu=neon" ]
@@ -318,7 +318,7 @@ if (rtc_build_with_neon) {
       "signal_processing/min_max_operations_neon.c",
     ]
 
-    if (current_cpu != "arm64") {
+    if (target_cpu != "arm64") {
       # Enable compilation for the NEON instruction set.
       suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
       cflags = [ "-mfpu=neon" ]
diff --git a/third_party/libwebrtc/common_audio/third_party/ooura/BUILD.gn b/third_party/libwebrtc/common_audio/third_party/ooura/BUILD.gn
index 0cdf98e59190..a0ddf777db82 100644
--- a/third_party/libwebrtc/common_audio/third_party/ooura/BUILD.gn
+++ b/third_party/libwebrtc/common_audio/third_party/ooura/BUILD.gn
@@ -20,7 +20,7 @@ rtc_library("fft_size_128") {
   ]
   cflags = []
 
-  if (current_cpu == "x86" || current_cpu == "x64") {
+  if (target_cpu == "x86" || target_cpu == "x64") {
     sources += [
       "fft_size_128/ooura_fft_sse2.cc",
       "fft_size_128/ooura_fft_tables_neon_sse2.h",
@@ -38,14 +38,14 @@ rtc_library("fft_size_128") {
 
     deps += [ "../../../common_audio" ]
 
-    if (current_cpu != "arm64") {
+    if (target_cpu != "arm64") {
       # Enable compilation for the NEON instruction set.
       suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
       cflags += [ "-mfpu=neon" ]
     }
   }
 
-  if (current_cpu == "mipsel" && mips_float_abi == "hard") {
+  if (target_cpu == "mipsel" && mips_float_abi == "hard") {
     sources += [ "fft_size_128/ooura_fft_mips.cc" ]
   }
 }