diff --git a/build_overrides/webrtc.gni b/build_overrides/webrtc.gni deleted file mode 100644 index 0192515d90..0000000000 --- a/build_overrides/webrtc.gni +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. - -# This file contains overrides to GN variables that applies for the WebRTC -# standalone build (i.e. not in Chromium). -# -# Every variable here needs to be present in the corresponding file in -# build_overrides/ of Chromium. - -# The build_with_chromium variable is now located in build.gni (now also used -# by BoringSSL). -import("//build_overrides/build.gni") - -# Excluded in Chromium since its prerequisites don't require Pulse Audio. -rtc_include_pulse_audio = true - -# Chromium uses its own IO handling, so the internal ADM is only built for -# standalone WebRTC. -rtc_include_internal_audio_device = true - -declare_args() { - # Include tests in standalone checkout. - rtc_include_tests = true -} diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn index a91b615c11..a415efbac7 100644 --- a/webrtc/base/BUILD.gn +++ b/webrtc/base/BUILD.gn @@ -10,8 +10,6 @@ import("//build/config/crypto.gni") import("//build/config/ui.gni") import("../build/webrtc.gni") -import("//build_overrides/webrtc.gni") - if (is_android) { import("//build/config/android/config.gni") import("//build/config/android/rules.gni") diff --git a/webrtc/build/webrtc.gni b/webrtc/build/webrtc.gni index eabdeb20e6..5c188a05bf 100644 --- a/webrtc/build/webrtc.gni +++ b/webrtc/build/webrtc.gni @@ -10,7 +10,7 @@ import("//build/config/arm.gni") import("//build/config/features.gni") import("//build/config/mips.gni") import("//build/config/sanitizers/sanitizers.gni") -import("//build_overrides/webrtc.gni") +import("//build_overrides/build.gni") import("//testing/test.gni") declare_args() { @@ -143,6 +143,16 @@ declare_args() { rtc_include_ilbc = !(build_with_chromium || build_with_mozilla) rtc_restrict_logging = build_with_chromium + + # Excluded in Chromium since its prerequisites don't require Pulse Audio. + rtc_include_pulse_audio = !build_with_chromium + + # Chromium uses its own IO handling, so the internal ADM is only built for + # standalone WebRTC. + rtc_include_internal_audio_device = !build_with_chromium + + # Include tests in standalone checkout. + rtc_include_tests = !build_with_chromium } # Make it possible to provide custom locations for some libraries (move these diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn index 73a749acf9..cfd4fdb569 100644 --- a/webrtc/sdk/BUILD.gn +++ b/webrtc/sdk/BUILD.gn @@ -7,7 +7,6 @@ # be found in the AUTHORS file in the root of the source tree. import("../build/webrtc.gni") -import("//build_overrides/webrtc.gni") import("//build/config/mac/mac_sdk.gni") if (is_ios || (is_mac && mac_deployment_target == "10.7")) { diff --git a/webrtc/test/fuzzers/BUILD.gn b/webrtc/test/fuzzers/BUILD.gn index 0447189e26..34ed84bdf9 100644 --- a/webrtc/test/fuzzers/BUILD.gn +++ b/webrtc/test/fuzzers/BUILD.gn @@ -8,7 +8,6 @@ import("../../build/webrtc.gni") import("//build/config/features.gni") -import("//build_overrides/webrtc.gni") import("//testing/libfuzzer/fuzzer_test.gni") rtc_static_library("webrtc_fuzzer_main") {