zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Moving webrtc.gni up one level from build/ (patchset #1 id:1 of https://codereview.webrtc.org/2651543003/ )

Browse Source 
Reason for revert:
This was causing the following failure: https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Builder/builds/838/steps/generate_build_files/logs/stdio

Original issue's description:
> 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}
> Committed: 35a32700fc

TBR=kjellander@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:7030

Review-Url: https://codereview.webrtc.org/2657563002
Cr-Commit-Position: refs/heads/master@{#16244}
This commit is contained in:
mbonadei
2017-01-24 05:14:35 -08:00
committed by Commit bot
parent e6b4723790
commit 69dc7dbe24
42 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.gn
View File

@ -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

2
webrtc/BUILD.gn
View File

@ -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")

2
webrtc/api/BUILD.gn
View File

@ -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")

2
webrtc/audio/BUILD.gn
View File

@ -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 = [

2
webrtc/audio/utility/BUILD.gn
View File

@ -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 = [

2
webrtc/base/BUILD.gn
View File

@ -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")

2
webrtc/webrtc.gni → webrtc/build/webrtc.gni
View File

@ -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

2
webrtc/call/BUILD.gn
View File

@ -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 = [

2
webrtc/common_audio/BUILD.gn
View File

@ -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 = [

2
webrtc/common_video/BUILD.gn
View File

@ -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 = [

2
webrtc/examples/BUILD.gn
View File

@ -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")

2
webrtc/logging/BUILD.gn
View File

@ -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")

2
webrtc/media/BUILD.gn
View File

@ -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 = [

2
webrtc/modules/BUILD.gn
View File

@ -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") {

2
webrtc/modules/audio_coding/BUILD.gn
View File

@ -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")

2
webrtc/modules/audio_coding/audio_coding.gni
View File

@ -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) {

2
webrtc/modules/audio_conference_mixer/BUILD.gn
View File

@ -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.

2
webrtc/modules/audio_device/BUILD.gn
View File

@ -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")

2
webrtc/modules/audio_mixer/BUILD.gn
View File

@ -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 = [

2
webrtc/modules/audio_processing/BUILD.gn
View File

@ -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

2
webrtc/modules/bitrate_controller/BUILD.gn
View File

@ -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)

2
webrtc/modules/congestion_controller/BUILD.gn
View File

@ -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 = [

2
webrtc/modules/desktop_capture/BUILD.gn
View File

@ -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"

2
webrtc/modules/media_file/BUILD.gn
View File

@ -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.

2
webrtc/modules/pacing/BUILD.gn
View File

@ -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 = [

2
webrtc/modules/remote_bitrate_estimator/BUILD.gn
View File

@ -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)

2
webrtc/modules/rtp_rtcp/BUILD.gn
View File

@ -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 = [

2
webrtc/modules/utility/BUILD.gn
View File

@ -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 = [

2
webrtc/modules/video_capture/BUILD.gn
View File

@ -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

2
webrtc/modules/video_coding/BUILD.gn
View File

@ -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 = [

2
webrtc/modules/video_processing/BUILD.gn
View File

@ -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"

2
webrtc/p2p/BUILD.gn
View File

@ -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 = [

2
webrtc/pc/BUILD.gn
View File

@ -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")

2
webrtc/sdk/BUILD.gn
View File

@ -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")
}

2
webrtc/sdk/android/BUILD.gn
View File

@ -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")

2
webrtc/stats/BUILD.gn
View File

@ -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 = [

2
webrtc/system_wrappers/BUILD.gn
View File

@ -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 = [

2
webrtc/test/BUILD.gn
View File

@ -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")

2
webrtc/test/fuzzers/BUILD.gn
View File

@ -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")

2
webrtc/tools/BUILD.gn
View File

@ -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/.

2
webrtc/video/BUILD.gn
View File

@ -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 = [

2
webrtc/voice_engine/BUILD.gn
View File

@ -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 = [