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}
This commit is contained in:
Jianjun Zhu
2017-08-15 21:48:37 +08:00
committed by Commit Bot
parent ac31526bb5
commit 037f3e42f2
10 changed files with 37 additions and 37 deletions

View File

@ -338,10 +338,10 @@ if (!build_with_chromium) {
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",

View File

@ -144,7 +144,7 @@ if (rtc_include_tests) {
# 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",

View File

@ -246,9 +246,9 @@ if (current_cpu == "x86" || current_cpu == "x64") {
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 @@ if (rtc_build_with_neon) {
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",

View File

@ -53,10 +53,10 @@ rtc_source_set("rtc_h264_profile_id") {
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 = []

View File

@ -672,13 +672,13 @@ if (rtc_include_tests) {
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

View File

@ -272,7 +272,7 @@ if (rtc_include_tests) {
# 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",

View File

@ -90,7 +90,7 @@ source_set("compile_assert_c") {
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 @@ if (rtc_include_tests) {
# 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 @@ if (rtc_include_tests) {
# 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 @@ if (rtc_include_tests) {
# 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 @@ if (rtc_include_tests) {
# 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 @@ if (rtc_include_tests) {
# 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 @@ if (rtc_include_tests) {
# 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 @@ if (rtc_include_tests) {
# 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",

View File

@ -107,7 +107,7 @@ rtc_static_library("system_wrappers") {
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" ]

View File

@ -106,16 +106,16 @@ if (rtc_include_tests) {
"../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).

View File

@ -272,8 +272,8 @@ template("rtc_test") {
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" ]
}
}
}