mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 14:50:39 +01:00
GN: Move variables from //build_overrides/webrtc.gni to //webrtc/build/webrtc.gni
There is no clear reason to have them in build_overrides, and webrtc/build seems to be a better place. Also, delete build_overrides/webrtc.gni NOTRY=True BUG=webrtc:5949 Review-Url: https://codereview.webrtc.org/2309253004 Cr-Commit-Position: refs/heads/master@{#14108}
This commit is contained in:
parent
d52063fb07
commit
4016a0b2e8
5 changed files with 11 additions and 34 deletions
|
@ -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
|
|
||||||
}
|
|
|
@ -10,8 +10,6 @@ import("//build/config/crypto.gni")
|
||||||
import("//build/config/ui.gni")
|
import("//build/config/ui.gni")
|
||||||
import("../build/webrtc.gni")
|
import("../build/webrtc.gni")
|
||||||
|
|
||||||
import("//build_overrides/webrtc.gni")
|
|
||||||
|
|
||||||
if (is_android) {
|
if (is_android) {
|
||||||
import("//build/config/android/config.gni")
|
import("//build/config/android/config.gni")
|
||||||
import("//build/config/android/rules.gni")
|
import("//build/config/android/rules.gni")
|
||||||
|
|
|
@ -10,7 +10,7 @@ import("//build/config/arm.gni")
|
||||||
import("//build/config/features.gni")
|
import("//build/config/features.gni")
|
||||||
import("//build/config/mips.gni")
|
import("//build/config/mips.gni")
|
||||||
import("//build/config/sanitizers/sanitizers.gni")
|
import("//build/config/sanitizers/sanitizers.gni")
|
||||||
import("//build_overrides/webrtc.gni")
|
import("//build_overrides/build.gni")
|
||||||
import("//testing/test.gni")
|
import("//testing/test.gni")
|
||||||
|
|
||||||
declare_args() {
|
declare_args() {
|
||||||
|
@ -143,6 +143,16 @@ declare_args() {
|
||||||
rtc_include_ilbc = !(build_with_chromium || build_with_mozilla)
|
rtc_include_ilbc = !(build_with_chromium || build_with_mozilla)
|
||||||
|
|
||||||
rtc_restrict_logging = build_with_chromium
|
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
|
# Make it possible to provide custom locations for some libraries (move these
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
# be found in the AUTHORS file in the root of the source tree.
|
# be found in the AUTHORS file in the root of the source tree.
|
||||||
|
|
||||||
import("../build/webrtc.gni")
|
import("../build/webrtc.gni")
|
||||||
import("//build_overrides/webrtc.gni")
|
|
||||||
import("//build/config/mac/mac_sdk.gni")
|
import("//build/config/mac/mac_sdk.gni")
|
||||||
|
|
||||||
if (is_ios || (is_mac && mac_deployment_target == "10.7")) {
|
if (is_ios || (is_mac && mac_deployment_target == "10.7")) {
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
import("../../build/webrtc.gni")
|
import("../../build/webrtc.gni")
|
||||||
import("//build/config/features.gni")
|
import("//build/config/features.gni")
|
||||||
import("//build_overrides/webrtc.gni")
|
|
||||||
import("//testing/libfuzzer/fuzzer_test.gni")
|
import("//testing/libfuzzer/fuzzer_test.gni")
|
||||||
|
|
||||||
rtc_static_library("webrtc_fuzzer_main") {
|
rtc_static_library("webrtc_fuzzer_main") {
|
||||||
|
|
Loading…
Reference in a new issue