Replace absolute path with relative path for GN files.
Bug: webrtc:7952
Change-Id: I45d889bd976f58386f803d0dc27147ea00a52e56
Reviewed-on: https://chromium-review.googlesource.com/612786
Commit-Queue: Henrik Kjellander <kjellander@webrtc.org>
Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
Reviewed-by: Edward Lemur <ehmaldonado@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19357}diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 54a7c1c..f403fbc 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -338,10 +338,10 @@
rtc_static_library("webrtc_common") {
# TODO(mbonadei): Remove (bugs.webrtc.org/7745)
# Enabling GN check triggers cyclic dependency error:
- # //webrtc:webrtc_common ->
- # //webrtc/api:video_frame_api ->
- # //webrtc/system_wrappers:system_wrappers ->
- # //webrtc:webrtc_common
+ # :webrtc_common ->
+ # api:video_frame_api ->
+ # system_wrappers:system_wrappers ->
+ # webrtc_common
check_includes = false
sources = [
"common_types.cc",
diff --git a/webrtc/audio/BUILD.gn b/webrtc/audio/BUILD.gn
index a75d8ef..50a2485 100644
--- a/webrtc/audio/BUILD.gn
+++ b/webrtc/audio/BUILD.gn
@@ -144,7 +144,7 @@
# gets additional generated targets which would require many lines here to
# cover (which would be confusing to read and hard to maintain).
if (!is_android && !is_ios) {
- visibility = [ "//webrtc:webrtc_perf_tests" ]
+ visibility = [ "..:webrtc_perf_tests" ]
}
sources = [
"test/audio_bwe_integration_test.cc",
diff --git a/webrtc/common_audio/BUILD.gn b/webrtc/common_audio/BUILD.gn
index f7f3efb..a51a83c 100644
--- a/webrtc/common_audio/BUILD.gn
+++ b/webrtc/common_audio/BUILD.gn
@@ -246,9 +246,9 @@
rtc_static_library("common_audio_sse2") {
# TODO(kjellander): Remove (bugs.webrtc.org/6828)
# Enabling GN check triggers dependency cycle:
- # //webrtc/common_audio:common_audio ->
- # //webrtc/common_audio:common_audio_sse2 ->
- # //webrtc/common_audio:common_audio
+ # :common_audio ->
+ # :common_audio_sse2 ->
+ # :common_audio
check_includes = false
sources = [
"fir_filter_sse.cc",
@@ -273,9 +273,9 @@
rtc_static_library("common_audio_neon") {
# TODO(kjellander): Remove (bugs.webrtc.org/6828)
# Enabling GN check triggers dependency cycle:
- # //webrtc/common_audio:common_audio ->
- # //webrtc/common_audio:common_audio_neon ->
- # //webrtc/common_audio:common_audio
+ # :common_audio ->
+ # :common_audio_neon ->
+ # :common_audio
check_includes = false
sources = [
"fir_filter_neon.cc",
diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn
index e9d8632..be75f6f 100644
--- a/webrtc/media/BUILD.gn
+++ b/webrtc/media/BUILD.gn
@@ -53,10 +53,10 @@
rtc_static_library("rtc_media_base") {
# TODO(kjellander): Remove (bugs.webrtc.org/6828)
# Enabling GN check triggers cyclic dependency error:
- # //webrtc/media:rtc_media_base ->
- # //webrtc/pc:rtc_pc_base ->
- # //webrtc/media:rtc_data ->
- # //webrtc/media:rtc_media_base
+ # :rtc_media_base ->
+ # ../pc:rtc_pc_base ->
+ # :rtc_data ->
+ # :rtc_media_base
check_includes = false
defines = []
libs = []
diff --git a/webrtc/modules/audio_processing/BUILD.gn b/webrtc/modules/audio_processing/BUILD.gn
index 4fd6e9f..a569bd1 100644
--- a/webrtc/modules/audio_processing/BUILD.gn
+++ b/webrtc/modules/audio_processing/BUILD.gn
@@ -672,13 +672,13 @@
rtc_source_set("audio_processing_perf_tests") {
# Has problems with autogenerated targets on Android and iOS
# Dependency chain (there may also be others):
- # //webrtc/modules/audio_processing:audio_processing_perf_tests -->
- # //webrtc/modules:modules_unittests --[private]-->
- # //webrtc/modules:modules_unittests_apk -->
- # //webrtc/modules:modules_unittests_apk__create -->
- # //webrtc/modules:modules_unittests_apk__create__finalize -->
- # //webrtc/modules:modules_unittests_apk__create__package --[private]-->
- # //webrtc/modules:_modules_unittests__library
+ # :audio_processing_perf_tests -->
+ # ..:modules_unittests --[private]-->
+ # ..:modules_unittests_apk -->
+ # ..:modules_unittests_apk__create -->
+ # ..:modules_unittests_apk__create__finalize -->
+ # ..:modules_unittests_apk__create__package --[private]-->
+ # ..:_modules_unittests__library
check_includes = false
testonly = true
diff --git a/webrtc/modules/rtp_rtcp/BUILD.gn b/webrtc/modules/rtp_rtcp/BUILD.gn
index 75e11f3..775ebcb 100644
--- a/webrtc/modules/rtp_rtcp/BUILD.gn
+++ b/webrtc/modules/rtp_rtcp/BUILD.gn
@@ -272,7 +272,7 @@
# gets additional generated targets which would require many lines here to
# cover (which would be confusing to read and hard to maintain).
if (!is_android && !is_ios) {
- visibility = [ "//webrtc/modules:modules_unittests" ]
+ visibility = [ "..:modules_unittests" ]
}
sources = [
"source/byte_io_unittest.cc",
diff --git a/webrtc/rtc_base/BUILD.gn b/webrtc/rtc_base/BUILD.gn
index 925f915..60d1f57 100644
--- a/webrtc/rtc_base/BUILD.gn
+++ b/webrtc/rtc_base/BUILD.gn
@@ -90,7 +90,7 @@
rtc_static_library("rtc_base_approved") {
# TODO(kjellander): Remove (bugs.webrtc.org/7480)
# Enabling GN check triggers a cyclic dependency caused by rate_limiter.cc:
- # :rtc_base_approved -> //webrtc/system_wrappers -> :rtc_base_approved
+ # :rtc_base_approved -> ../system_wrappers -> :rtc_base_approved
check_includes = false
defines = []
libs = []
@@ -765,7 +765,7 @@
# cover (which would be confusing to read and hard to maintain).
if (!is_android && !is_ios) {
# TODO(kjellander): Reenable after finishing https://bugs.webrtc.org/7634.
- #visibility = [ "//webrtc:webrtc_nonparallel_tests" ]
+ #visibility = [ "..:webrtc_nonparallel_tests" ]
}
sources = [
"cpu_time_unittest.cc",
@@ -802,7 +802,7 @@
# cover (which would be confusing to read and hard to maintain).
if (!is_android && !is_ios) {
# TODO(kjellander): Reenable after finishing https://bugs.webrtc.org/7634.
- #visibility = [ "//webrtc:rtc_unittests" ]
+ #visibility = [ "..:rtc_unittests" ]
}
sources = [
"array_view_unittest.cc",
@@ -869,7 +869,7 @@
# cover (which would be confusing to read and hard to maintain).
if (!is_android && !is_ios) {
# TODO(kjellander): Reenable after finishing https://bugs.webrtc.org/7634.
- #visibility = [ "//webrtc:rtc_unittests" ]
+ #visibility = [ "..:rtc_unittests" ]
}
sources = [
"task_queue_unittest.cc",
@@ -894,7 +894,7 @@
# cover (which would be confusing to read and hard to maintain).
if (!is_android && !is_ios) {
# TODO(kjellander): Reenable after finishing https://bugs.webrtc.org/7634.
- #visibility = [ "//webrtc:rtc_unittests" ]
+ #visibility = [ "..:rtc_unittests" ]
}
sources = [
"sequenced_task_checker_unittest.cc",
@@ -916,7 +916,7 @@
# cover (which would be confusing to read and hard to maintain).
if (!is_android && !is_ios) {
# TODO(kjellander): Reenable after finishing https://bugs.webrtc.org/7634.
- #visibility = [ "//webrtc:rtc_unittests" ]
+ #visibility = [ "..:rtc_unittests" ]
}
sources = [
"weak_ptr_unittest.cc",
@@ -938,7 +938,7 @@
# cover (which would be confusing to read and hard to maintain).
if (!is_android && !is_ios) {
# TODO(kjellander): Reenable after finishing https://bugs.webrtc.org/7634.
- #visibility = [ "//webrtc:rtc_unittests" ]
+ #visibility = [ "..:rtc_unittests" ]
}
sources = [
"numerics/exp_filter_unittest.cc",
@@ -965,7 +965,7 @@
# cover (which would be confusing to read and hard to maintain).
if (!is_android && !is_ios) {
# TODO(kjellander): Reenable after finishing https://bugs.webrtc.org/7634.
- #visibility = [ "//webrtc:rtc_unittests" ]
+ #visibility = [ "..:rtc_unittests" ]
}
sources = [
"callback_unittest.cc",
diff --git a/webrtc/system_wrappers/BUILD.gn b/webrtc/system_wrappers/BUILD.gn
index 7dfcff7..29ee8b8 100644
--- a/webrtc/system_wrappers/BUILD.gn
+++ b/webrtc/system_wrappers/BUILD.gn
@@ -107,7 +107,7 @@
cflags = [ "/wd4334" ] # Ignore warning on shift operator promotion.
- # Windows needs //webrtc/rtc_base:rtc_base due to include of
+ # Windows needs ../rtc_base:rtc_base due to include of
# webrtc/rtc_base/win32.h in source/clock.cc.
# TODO(kjellander): Remove (bugs.webrtc.org/6828)
deps += [ "../rtc_base:rtc_base" ]
diff --git a/webrtc/video/BUILD.gn b/webrtc/video/BUILD.gn
index 28025e8..08abe68 100644
--- a/webrtc/video/BUILD.gn
+++ b/webrtc/video/BUILD.gn
@@ -106,16 +106,16 @@
"../rtc_base:rtc_base_tests_utils",
"../rtc_base:rtc_task_queue",
"../system_wrappers",
+ "../test:rtp_test_utils",
"../test:test_common",
"../test:test_renderer",
+ "../test:test_renderer",
"../test:test_support",
"../test:video_test_common",
+ "../test:video_test_common",
"../test:video_test_support",
"../voice_engine",
"//testing/gtest",
- "//webrtc/test:rtp_test_utils",
- "//webrtc/test:test_renderer",
- "//webrtc/test:video_test_common",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
diff --git a/webrtc/webrtc.gni b/webrtc/webrtc.gni
index 876ddeb..071c9cc 100644
--- a/webrtc/webrtc.gni
+++ b/webrtc/webrtc.gni
@@ -272,8 +272,8 @@
public_configs += invoker.public_configs
}
if (!build_with_chromium && is_android) {
- android_manifest = "//webrtc/test/android/AndroidManifest.xml"
- deps += [ "//webrtc/test:native_test_java" ]
+ android_manifest = webrtc_root + "test/android/AndroidManifest.xml"
+ deps += [ webrtc_root + "test:native_test_java" ]
}
}
}