Moving webrtc.gni up one level from build/
BUG=webrtc:7030
Review-Url: https://codereview.webrtc.org/2651543003
Cr-Commit-Position: refs/heads/master@{#16241}
diff --git a/BUILD.gn b/BUILD.gn
index 62e06ad..4e6816f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("webrtc/build/webrtc.gni")
+import("webrtc/webrtc.gni")
group("default") {
testonly = true
diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index e22ad24..d206d9f 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -10,7 +10,7 @@
import("//build/config/linux/pkg_config.gni")
import("//build/config/sanitizers/sanitizers.gni")
-import("build/webrtc.gni")
+import("webrtc.gni")
import("//third_party/protobuf/proto_library.gni")
if (is_android) {
import("//build/config/android/config.gni")
diff --git a/webrtc/api/BUILD.gn b/webrtc/api/BUILD.gn
index af49219..038766a 100644
--- a/webrtc/api/BUILD.gn
+++ b/webrtc/api/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../build/webrtc.gni")
+import("../webrtc.gni")
if (is_android) {
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
diff --git a/webrtc/audio/BUILD.gn b/webrtc/audio/BUILD.gn
index 9ded96f..80d5416 100644
--- a/webrtc/audio/BUILD.gn
+++ b/webrtc/audio/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../build/webrtc.gni")
+import("../webrtc.gni")
rtc_static_library("audio") {
sources = [
diff --git a/webrtc/audio/utility/BUILD.gn b/webrtc/audio/utility/BUILD.gn
index df5f322..2ef5eba 100644
--- a/webrtc/audio/utility/BUILD.gn
+++ b/webrtc/audio/utility/BUILD.gn
@@ -5,7 +5,7 @@
# 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.
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
group("utility") {
public_deps = [
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index 248ef13..13ad5fd 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -8,7 +8,7 @@
import("//build/config/crypto.gni")
import("//build/config/ui.gni")
-import("../build/webrtc.gni")
+import("../webrtc.gni")
if (is_android) {
import("//build/config/android/config.gni")
diff --git a/webrtc/call/BUILD.gn b/webrtc/call/BUILD.gn
index 195c37f..acad72d 100644
--- a/webrtc/call/BUILD.gn
+++ b/webrtc/call/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../build/webrtc.gni")
+import("../webrtc.gni")
rtc_source_set("call_interfaces") {
sources = [
diff --git a/webrtc/common_audio/BUILD.gn b/webrtc/common_audio/BUILD.gn
index 2d46f67..a3cf046 100644
--- a/webrtc/common_audio/BUILD.gn
+++ b/webrtc/common_audio/BUILD.gn
@@ -7,7 +7,7 @@
# be found in the AUTHORS file in the root of the source tree.
import("//build/config/arm.gni")
-import("../build/webrtc.gni")
+import("../webrtc.gni")
config("common_audio_config") {
include_dirs = [
diff --git a/webrtc/common_video/BUILD.gn b/webrtc/common_video/BUILD.gn
index 3b33bcc..1c13fa4 100644
--- a/webrtc/common_video/BUILD.gn
+++ b/webrtc/common_video/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../build/webrtc.gni")
+import("../webrtc.gni")
config("common_video_config") {
include_dirs = [
diff --git a/webrtc/examples/BUILD.gn b/webrtc/examples/BUILD.gn
index 6f7eaa7..dfe15d1 100644
--- a/webrtc/examples/BUILD.gn
+++ b/webrtc/examples/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../build/webrtc.gni")
+import("../webrtc.gni")
if (is_android) {
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
diff --git a/webrtc/logging/BUILD.gn b/webrtc/logging/BUILD.gn
index 98776d3..a159455 100644
--- a/webrtc/logging/BUILD.gn
+++ b/webrtc/logging/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../build/webrtc.gni")
+import("../webrtc.gni")
import("//third_party/protobuf/proto_library.gni")
if (is_android) {
import("//build/config/android/config.gni")
diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn
index 7f8a1f6..06aed45 100644
--- a/webrtc/media/BUILD.gn
+++ b/webrtc/media/BUILD.gn
@@ -7,7 +7,7 @@
# be found in the AUTHORS file in the root of the source tree.
import("//build/config/linux/pkg_config.gni")
-import("../build/webrtc.gni")
+import("../webrtc.gni")
group("media") {
public_deps = [
diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn
index d87e7f9..e44b35f 100644
--- a/webrtc/modules/BUILD.gn
+++ b/webrtc/modules/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../build/webrtc.gni")
+import("../webrtc.gni")
import("audio_coding/audio_coding.gni")
group("modules") {
diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index 2cfd159..9c285c9 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
import("audio_coding.gni")
import("//build/config/arm.gni")
import("//third_party/protobuf/proto_library.gni")
diff --git a/webrtc/modules/audio_coding/audio_coding.gni b/webrtc/modules/audio_coding/audio_coding.gni
index 13577f8..0f3a75f 100644
--- a/webrtc/modules/audio_coding/audio_coding.gni
+++ b/webrtc/modules/audio_coding/audio_coding.gni
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
audio_codec_defines = []
if (rtc_include_ilbc) {
diff --git a/webrtc/modules/audio_conference_mixer/BUILD.gn b/webrtc/modules/audio_conference_mixer/BUILD.gn
index b4705d5..428bcac 100644
--- a/webrtc/modules/audio_conference_mixer/BUILD.gn
+++ b/webrtc/modules/audio_conference_mixer/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
config("audio_conference_mixer_config") {
visibility = [ ":*" ] # Only targets in this file can depend on this.
diff --git a/webrtc/modules/audio_device/BUILD.gn b/webrtc/modules/audio_device/BUILD.gn
index 4dc6760..ac8fdbe 100644
--- a/webrtc/modules/audio_device/BUILD.gn
+++ b/webrtc/modules/audio_device/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
if (is_android) {
import("//build/config/android/config.gni")
diff --git a/webrtc/modules/audio_mixer/BUILD.gn b/webrtc/modules/audio_mixer/BUILD.gn
index 25c782b..083e02b 100644
--- a/webrtc/modules/audio_mixer/BUILD.gn
+++ b/webrtc/modules/audio_mixer/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
group("audio_mixer") {
public_deps = [
diff --git a/webrtc/modules/audio_processing/BUILD.gn b/webrtc/modules/audio_processing/BUILD.gn
index 4f3ea13..87501f4 100644
--- a/webrtc/modules/audio_processing/BUILD.gn
+++ b/webrtc/modules/audio_processing/BUILD.gn
@@ -8,7 +8,7 @@
import("//build/config/arm.gni")
import("//third_party/protobuf/proto_library.gni")
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
declare_args() {
# Disables the usual mode where we trust the reported system delay
diff --git a/webrtc/modules/bitrate_controller/BUILD.gn b/webrtc/modules/bitrate_controller/BUILD.gn
index b2747db..58398f3 100644
--- a/webrtc/modules/bitrate_controller/BUILD.gn
+++ b/webrtc/modules/bitrate_controller/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
rtc_static_library("bitrate_controller") {
# TODO(mbonadei): Remove (bugs.webrtc.org/6828)
diff --git a/webrtc/modules/congestion_controller/BUILD.gn b/webrtc/modules/congestion_controller/BUILD.gn
index 03e0d5c..a20339c 100644
--- a/webrtc/modules/congestion_controller/BUILD.gn
+++ b/webrtc/modules/congestion_controller/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
rtc_static_library("congestion_controller") {
sources = [
diff --git a/webrtc/modules/desktop_capture/BUILD.gn b/webrtc/modules/desktop_capture/BUILD.gn
index 67ec8ce..9c9a466 100644
--- a/webrtc/modules/desktop_capture/BUILD.gn
+++ b/webrtc/modules/desktop_capture/BUILD.gn
@@ -7,7 +7,7 @@
# be found in the AUTHORS file in the root of the source tree.
import("//build/config/ui.gni")
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
use_desktop_capture_differ_sse2 = current_cpu == "x86" || current_cpu == "x64"
diff --git a/webrtc/modules/media_file/BUILD.gn b/webrtc/modules/media_file/BUILD.gn
index 8003cd8..32825af 100644
--- a/webrtc/modules/media_file/BUILD.gn
+++ b/webrtc/modules/media_file/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
config("media_file_config") {
visibility = [ ":*" ] # Only targets in this file can depend on this.
diff --git a/webrtc/modules/pacing/BUILD.gn b/webrtc/modules/pacing/BUILD.gn
index 0a357c0..f94def7 100644
--- a/webrtc/modules/pacing/BUILD.gn
+++ b/webrtc/modules/pacing/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
rtc_static_library("pacing") {
sources = [
diff --git a/webrtc/modules/remote_bitrate_estimator/BUILD.gn b/webrtc/modules/remote_bitrate_estimator/BUILD.gn
index 81028f6..13e2382 100644
--- a/webrtc/modules/remote_bitrate_estimator/BUILD.gn
+++ b/webrtc/modules/remote_bitrate_estimator/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
rtc_static_library("remote_bitrate_estimator") {
# TODO(mbonadei): Remove (bugs.webrtc.org/6828)
diff --git a/webrtc/modules/rtp_rtcp/BUILD.gn b/webrtc/modules/rtp_rtcp/BUILD.gn
index 9b23621..4fa4d49 100644
--- a/webrtc/modules/rtp_rtcp/BUILD.gn
+++ b/webrtc/modules/rtp_rtcp/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
rtc_static_library("rtp_rtcp") {
sources = [
diff --git a/webrtc/modules/utility/BUILD.gn b/webrtc/modules/utility/BUILD.gn
index 5b6a232..ec11b9f 100644
--- a/webrtc/modules/utility/BUILD.gn
+++ b/webrtc/modules/utility/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
rtc_static_library("utility") {
sources = [
diff --git a/webrtc/modules/video_capture/BUILD.gn b/webrtc/modules/video_capture/BUILD.gn
index 6887552..90b824a 100644
--- a/webrtc/modules/video_capture/BUILD.gn
+++ b/webrtc/modules/video_capture/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
# Note this target is missing an implementation for the video capture.
# Targets must link with either 'video_capture' or
diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn
index f84936a..5750d10 100644
--- a/webrtc/modules/video_coding/BUILD.gn
+++ b/webrtc/modules/video_coding/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
rtc_static_library("video_coding") {
sources = [
diff --git a/webrtc/modules/video_processing/BUILD.gn b/webrtc/modules/video_processing/BUILD.gn
index 5da0ae8..6da43b4 100644
--- a/webrtc/modules/video_processing/BUILD.gn
+++ b/webrtc/modules/video_processing/BUILD.gn
@@ -7,7 +7,7 @@
# be found in the AUTHORS file in the root of the source tree.
import("//build/config/arm.gni")
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
build_video_processing_sse2 = current_cpu == "x86" || current_cpu == "x64"
diff --git a/webrtc/p2p/BUILD.gn b/webrtc/p2p/BUILD.gn
index e99440c..04e9b17 100644
--- a/webrtc/p2p/BUILD.gn
+++ b/webrtc/p2p/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../build/webrtc.gni")
+import("../webrtc.gni")
group("p2p") {
public_deps = [
diff --git a/webrtc/pc/BUILD.gn b/webrtc/pc/BUILD.gn
index d447db7..5aa3ae4 100644
--- a/webrtc/pc/BUILD.gn
+++ b/webrtc/pc/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../build/webrtc.gni")
+import("../webrtc.gni")
if (is_android) {
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn
index e610242..9f3ccc6 100644
--- a/webrtc/sdk/BUILD.gn
+++ b/webrtc/sdk/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../build/webrtc.gni")
+import("../webrtc.gni")
if (is_ios) {
import("//build/config/ios/rules.gni")
}
diff --git a/webrtc/sdk/android/BUILD.gn b/webrtc/sdk/android/BUILD.gn
index 1df43e2..710d962 100644
--- a/webrtc/sdk/android/BUILD.gn
+++ b/webrtc/sdk/android/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("//webrtc/build/webrtc.gni")
+import("//webrtc/webrtc.gni")
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
diff --git a/webrtc/stats/BUILD.gn b/webrtc/stats/BUILD.gn
index 8fa8087..85ba21d 100644
--- a/webrtc/stats/BUILD.gn
+++ b/webrtc/stats/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../build/webrtc.gni")
+import("../webrtc.gni")
group("stats") {
public_deps = [
diff --git a/webrtc/system_wrappers/BUILD.gn b/webrtc/system_wrappers/BUILD.gn
index 745867b..96177fd 100644
--- a/webrtc/system_wrappers/BUILD.gn
+++ b/webrtc/system_wrappers/BUILD.gn
@@ -10,7 +10,7 @@
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
}
-import("../build/webrtc.gni")
+import("../webrtc.gni")
rtc_static_library("system_wrappers") {
sources = [
diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn
index 5ad85fc..9893814 100644
--- a/webrtc/test/BUILD.gn
+++ b/webrtc/test/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../build/webrtc.gni")
+import("../webrtc.gni")
import("//build/config/ui.gni")
if (is_android) {
import("//build/config/android/rules.gni")
diff --git a/webrtc/test/fuzzers/BUILD.gn b/webrtc/test/fuzzers/BUILD.gn
index ea2352a..031ed8b 100644
--- a/webrtc/test/fuzzers/BUILD.gn
+++ b/webrtc/test/fuzzers/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../../build/webrtc.gni")
+import("../../webrtc.gni")
import("//build/config/features.gni")
import("//testing/libfuzzer/fuzzer_test.gni")
diff --git a/webrtc/tools/BUILD.gn b/webrtc/tools/BUILD.gn
index b1e603c..d2992a4 100644
--- a/webrtc/tools/BUILD.gn
+++ b/webrtc/tools/BUILD.gn
@@ -7,7 +7,7 @@
# be found in the AUTHORS file in the root of the source tree.
import("//third_party/protobuf/proto_library.gni")
-import("../build/webrtc.gni")
+import("../webrtc.gni")
group("tools") {
# This target shall build all targets in tools/.
diff --git a/webrtc/video/BUILD.gn b/webrtc/video/BUILD.gn
index ed69526..48dff5b 100644
--- a/webrtc/video/BUILD.gn
+++ b/webrtc/video/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../build/webrtc.gni")
+import("../webrtc.gni")
rtc_static_library("video") {
sources = [
diff --git a/webrtc/voice_engine/BUILD.gn b/webrtc/voice_engine/BUILD.gn
index c29e646..cb97693 100644
--- a/webrtc/voice_engine/BUILD.gn
+++ b/webrtc/voice_engine/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-import("../build/webrtc.gni")
+import("../webrtc.gni")
rtc_static_library("audio_coder") {
sources = [
diff --git a/webrtc/build/webrtc.gni b/webrtc/webrtc.gni
similarity index 99%
rename from webrtc/build/webrtc.gni
rename to webrtc/webrtc.gni
index d179ed4..53dcae2 100644
--- a/webrtc/build/webrtc.gni
+++ b/webrtc/webrtc.gni
@@ -178,7 +178,7 @@
# chromium.
# We need absolute paths for all configs in templates as they are shared in
# different subdirectories.
-webrtc_root = get_path_info("../", "abspath")
+webrtc_root = get_path_info(".", "abspath")
# Global configuration that should be applied to all WebRTC targets.
# You normally shouldn't need to include this in your target as it's