From: Nico Grunbaum Date: Wed, 14 Jul 2021 22:26:00 +0000 Subject: Bug 1654112 - deconflate the target and host architectures in libwebrtc build files; r=mjf Differential Revision: https://phabricator.services.mozilla.com/D119707 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/58f47eacaf10d12e21dff7362743b6f4cdd1696b --- BUILD.gn | 6 +++--- common_audio/BUILD.gn | 16 ++++++++-------- common_audio/third_party/ooura/BUILD.gn | 6 +++--- common_audio/third_party/spl_sqrt_floor/BUILD.gn | 4 ++-- modules/audio_processing/aec3/BUILD.gn | 6 +++--- modules/audio_processing/aecm/BUILD.gn | 4 ++-- modules/audio_processing/agc/BUILD.gn | 2 +- modules/audio_processing/agc2/rnn_vad/BUILD.gn | 2 +- modules/audio_processing/ns/BUILD.gn | 2 +- modules/desktop_capture/BUILD.gn | 2 +- webrtc.gni | 4 ++-- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 7859461b97..71788ddbc2 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -443,12 +443,12 @@ config("common_config") { } } - if (current_cpu == "arm64") { + if (target_cpu == "arm64") { defines += [ "WEBRTC_ARCH_ARM64" ] defines += [ "WEBRTC_HAS_NEON" ] } - if (current_cpu == "arm") { + if (target_cpu == "arm") { defines += [ "WEBRTC_ARCH_ARM" ] if (arm_version >= 7) { defines += [ "WEBRTC_ARCH_ARM_V7" ] @@ -458,7 +458,7 @@ config("common_config") { } } - if (current_cpu == "mipsel") { + if (target_cpu == "mipsel") { defines += [ "MIPS32_LE" ] if (mips_float_abi == "hard") { defines += [ "MIPS_FPU_LE" ] diff --git a/common_audio/BUILD.gn b/common_audio/BUILD.gn index 4dde7fe7f6..16ad9c11e9 100644 --- a/common_audio/BUILD.gn +++ b/common_audio/BUILD.gn @@ -66,7 +66,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 @@ rtc_source_set("mock_common_audio") { 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", @@ -228,7 +228,7 @@ rtc_library("fir_filter_factory") { "../rtc_base:cpu_info", "../rtc_base/system:arch", ] - if (current_cpu == "x86" || current_cpu == "x64") { + if (target_cpu == "x86" || target_cpu == "x64") { deps += [ ":common_audio_sse2" ] deps += [ ":common_audio_avx2" ] } @@ -237,7 +237,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", @@ -286,7 +286,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" ] @@ -309,7 +309,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/common_audio/third_party/ooura/BUILD.gn b/common_audio/third_party/ooura/BUILD.gn index a12adb2c0b..589142b014 100644 --- a/common_audio/third_party/ooura/BUILD.gn +++ b/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" ] } } diff --git a/common_audio/third_party/spl_sqrt_floor/BUILD.gn b/common_audio/third_party/spl_sqrt_floor/BUILD.gn index ac862c65a8..e66ed2796e 100644 --- a/common_audio/third_party/spl_sqrt_floor/BUILD.gn +++ b/common_audio/third_party/spl_sqrt_floor/BUILD.gn @@ -12,11 +12,11 @@ rtc_library("spl_sqrt_floor") { visibility = [ "../..:common_audio_c" ] sources = [ "spl_sqrt_floor.h" ] deps = [] - if (current_cpu == "arm") { + if (target_cpu == "arm") { sources += [ "spl_sqrt_floor_arm.S" ] deps += [ "../../../rtc_base/system:asm_defines" ] - } else if (current_cpu == "mipsel") { + } else if (target_cpu == "mipsel") { sources += [ "spl_sqrt_floor_mips.c" ] } else { sources += [ "spl_sqrt_floor.c" ] diff --git a/modules/audio_processing/aec3/BUILD.gn b/modules/audio_processing/aec3/BUILD.gn index 8605e38a1e..6d942b7883 100644 --- a/modules/audio_processing/aec3/BUILD.gn +++ b/modules/audio_processing/aec3/BUILD.gn @@ -123,7 +123,7 @@ rtc_library("aec3") { ] defines = [] - if (rtc_build_with_neon && current_cpu != "arm64") { + if (rtc_build_with_neon && target_cpu != "arm64") { suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ] cflags = [ "-mfpu=neon" ] } @@ -161,7 +161,7 @@ rtc_library("aec3") { "//third_party/abseil-cpp/absl/strings:string_view", ] - if (current_cpu == "x86" || current_cpu == "x64") { + if (target_cpu == "x86" || target_cpu == "x64") { deps += [ ":aec3_avx2" ] } } @@ -252,7 +252,7 @@ rtc_source_set("fft_data") { ] } -if (current_cpu == "x86" || current_cpu == "x64") { +if (target_cpu == "x86" || target_cpu == "x64") { rtc_library("aec3_avx2") { configs += [ "..:apm_debug_dump" ] sources = [ diff --git a/modules/audio_processing/aecm/BUILD.gn b/modules/audio_processing/aecm/BUILD.gn index a945d0c58d..f01637f2da 100644 --- a/modules/audio_processing/aecm/BUILD.gn +++ b/modules/audio_processing/aecm/BUILD.gn @@ -28,14 +28,14 @@ rtc_library("aecm_core") { if (rtc_build_with_neon) { sources += [ "aecm_core_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" ] } } - if (current_cpu == "mipsel") { + if (target_cpu == "mipsel") { sources += [ "aecm_core_mips.cc" ] } else { sources += [ "aecm_core_c.cc" ] diff --git a/modules/audio_processing/agc/BUILD.gn b/modules/audio_processing/agc/BUILD.gn index f0824fea75..de7a61b909 100644 --- a/modules/audio_processing/agc/BUILD.gn +++ b/modules/audio_processing/agc/BUILD.gn @@ -84,7 +84,7 @@ rtc_library("legacy_agc") { ] if (rtc_build_with_neon) { - 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/modules/audio_processing/agc2/rnn_vad/BUILD.gn b/modules/audio_processing/agc2/rnn_vad/BUILD.gn index 1f3a66667a..0fb06b2a86 100644 --- a/modules/audio_processing/agc2/rnn_vad/BUILD.gn +++ b/modules/audio_processing/agc2/rnn_vad/BUILD.gn @@ -18,7 +18,7 @@ rtc_library("rnn_vad") { ] defines = [] - if (rtc_build_with_neon && current_cpu != "arm64") { + if (rtc_build_with_neon && target_cpu != "arm64") { suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ] cflags = [ "-mfpu=neon" ] } diff --git a/modules/audio_processing/ns/BUILD.gn b/modules/audio_processing/ns/BUILD.gn index e90ef0e06a..0e96125f40 100644 --- a/modules/audio_processing/ns/BUILD.gn +++ b/modules/audio_processing/ns/BUILD.gn @@ -43,7 +43,7 @@ rtc_static_library("ns") { ] defines = [] - if (rtc_build_with_neon && current_cpu != "arm64") { + if (rtc_build_with_neon && target_cpu != "arm64") { suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ] cflags = [ "-mfpu=neon" ] } diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn index ff3f4d5b93..b95f1aa2d0 100644 --- a/modules/desktop_capture/BUILD.gn +++ b/modules/desktop_capture/BUILD.gn @@ -10,7 +10,7 @@ import("//build/config/linux/gtk/gtk.gni") import("//build/config/ui.gni") import("../../webrtc.gni") -use_desktop_capture_differ_sse2 = current_cpu == "x86" || current_cpu == "x64" +use_desktop_capture_differ_sse2 = target_cpu == "x86" || target_cpu == "x64" config("x11_config") { if (rtc_use_x11_extensions) { diff --git a/webrtc.gni b/webrtc.gni index ec55e54b9d..a11f4b9ab9 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -169,13 +169,13 @@ declare_args() { # Selects fixed-point code where possible. rtc_prefer_fixed_point = false - if (current_cpu == "arm" || current_cpu == "arm64") { + if (target_cpu == "arm" || target_cpu == "arm64") { rtc_prefer_fixed_point = true } # Determines whether NEON code will be built. rtc_build_with_neon = - (current_cpu == "arm" && arm_use_neon) || current_cpu == "arm64" + (target_cpu == "arm" && arm_use_neon) || target_cpu == "arm64" # Enable this to build OpenH264 encoder/FFmpeg decoder. When building WebRTC # as part of Chromium, this is delegated to `media_use_openh264`. When