diff --git a/BUILD.gn b/BUILD.gn index 4e6816fd85..62e06ad4ac 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/webrtc.gni") +import("webrtc/build/webrtc.gni") group("default") { testonly = true diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index d206d9f7b0..e22ad24ea2 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("webrtc.gni") +import("build/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 038766aa9a..af49219e46 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("../webrtc.gni") +import("../build/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 80d541624c..9ded96f06f 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("../webrtc.gni") +import("../build/webrtc.gni") rtc_static_library("audio") { sources = [ diff --git a/webrtc/audio/utility/BUILD.gn b/webrtc/audio/utility/BUILD.gn index 2ef5eba338..df5f322fed 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("../../webrtc.gni") +import("../../build/webrtc.gni") group("utility") { public_deps = [ diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn index 13ad5fdc00..248ef13f5f 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("../webrtc.gni") +import("../build/webrtc.gni") if (is_android) { import("//build/config/android/config.gni") diff --git a/webrtc/webrtc.gni b/webrtc/build/webrtc.gni similarity index 99% rename from webrtc/webrtc.gni rename to webrtc/build/webrtc.gni index 53dcae2b7c..d179ed4e7d 100644 --- a/webrtc/webrtc.gni +++ b/webrtc/build/webrtc.gni @@ -178,7 +178,7 @@ rtc_desktop_capture_supported = is_win || is_mac || is_linux # 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 diff --git a/webrtc/call/BUILD.gn b/webrtc/call/BUILD.gn index acad72d461..195c37f614 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("../webrtc.gni") +import("../build/webrtc.gni") rtc_source_set("call_interfaces") { sources = [ diff --git a/webrtc/common_audio/BUILD.gn b/webrtc/common_audio/BUILD.gn index a3cf046bb4..2d46f67ef2 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("../webrtc.gni") +import("../build/webrtc.gni") config("common_audio_config") { include_dirs = [ diff --git a/webrtc/common_video/BUILD.gn b/webrtc/common_video/BUILD.gn index 1c13fa4b06..3b33bcca8d 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("../webrtc.gni") +import("../build/webrtc.gni") config("common_video_config") { include_dirs = [ diff --git a/webrtc/examples/BUILD.gn b/webrtc/examples/BUILD.gn index dfe15d18d7..6f7eaa702b 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("../webrtc.gni") +import("../build/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 fd0caca037..792eb93a9a 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("../webrtc.gni") +import("../build/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 06aed45662..7f8a1f6fca 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("../webrtc.gni") +import("../build/webrtc.gni") group("media") { public_deps = [ diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn index e44b35f4c3..d87e7f9612 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("../webrtc.gni") +import("../build/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 404637357d..044d57e6a0 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("../../webrtc.gni") +import("../../build/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 0f3a75fbac..13577f86b3 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("../../webrtc.gni") +import("../../build/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 428bcac03c..b4705d5329 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("../../webrtc.gni") +import("../../build/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 ac8fdbe959..4dc6760144 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("../../webrtc.gni") +import("../../build/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 083e02b9ca..25c782bc9b 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("../../webrtc.gni") +import("../../build/webrtc.gni") group("audio_mixer") { public_deps = [ diff --git a/webrtc/modules/audio_processing/BUILD.gn b/webrtc/modules/audio_processing/BUILD.gn index 87501f4cdb..4f3ea13efb 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("../../webrtc.gni") +import("../../build/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 58398f367f..b2747db26c 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("../../webrtc.gni") +import("../../build/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 a20339cd78..03e0d5c93f 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("../../webrtc.gni") +import("../../build/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 9c9a46631e..67ec8cea37 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("../../webrtc.gni") +import("../../build/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 32825afb2b..8003cd8160 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("../../webrtc.gni") +import("../../build/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 f94def78be..0a357c00d0 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("../../webrtc.gni") +import("../../build/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 13e2382b84..81028f6b63 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("../../webrtc.gni") +import("../../build/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 4fa4d4963d..9b236218b3 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("../../webrtc.gni") +import("../../build/webrtc.gni") rtc_static_library("rtp_rtcp") { sources = [ diff --git a/webrtc/modules/utility/BUILD.gn b/webrtc/modules/utility/BUILD.gn index ec11b9fdf1..5b6a232adc 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("../../webrtc.gni") +import("../../build/webrtc.gni") rtc_static_library("utility") { sources = [ diff --git a/webrtc/modules/video_capture/BUILD.gn b/webrtc/modules/video_capture/BUILD.gn index 90b824a5b8..6887552b58 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("../../webrtc.gni") +import("../../build/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 5750d10178..f84936ad79 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("../../webrtc.gni") +import("../../build/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 6da43b422b..5da0ae89ee 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("../../webrtc.gni") +import("../../build/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 04e9b17908..e99440cf43 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("../webrtc.gni") +import("../build/webrtc.gni") group("p2p") { public_deps = [ diff --git a/webrtc/pc/BUILD.gn b/webrtc/pc/BUILD.gn index 5aa3ae4eac..d447db743a 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("../webrtc.gni") +import("../build/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 9f3ccc6b7d..e610242f63 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("../webrtc.gni") +import("../build/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 710d962125..1df43e2e2a 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/webrtc.gni") +import("//webrtc/build/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 85ba21d15e..8fa80879a3 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("../webrtc.gni") +import("../build/webrtc.gni") group("stats") { public_deps = [ diff --git a/webrtc/system_wrappers/BUILD.gn b/webrtc/system_wrappers/BUILD.gn index 96177fd508..745867bf91 100644 --- a/webrtc/system_wrappers/BUILD.gn +++ b/webrtc/system_wrappers/BUILD.gn @@ -10,7 +10,7 @@ if (is_android) { import("//build/config/android/config.gni") import("//build/config/android/rules.gni") } -import("../webrtc.gni") +import("../build/webrtc.gni") rtc_static_library("system_wrappers") { sources = [ diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn index 9893814748..5ad85fce24 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("../webrtc.gni") +import("../build/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 031ed8b342..ea2352a82c 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("../../webrtc.gni") +import("../../build/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 46a0ede844..8773cfc377 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("../webrtc.gni") +import("../build/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 48dff5ba07..ed69526d52 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("../webrtc.gni") +import("../build/webrtc.gni") rtc_static_library("video") { sources = [ diff --git a/webrtc/voice_engine/BUILD.gn b/webrtc/voice_engine/BUILD.gn index cb97693232..c29e646e18 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("../webrtc.gni") +import("../build/webrtc.gni") rtc_static_library("audio_coder") { sources = [