diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index 9280d540bc..e057ebe415 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -316,7 +316,7 @@ if (!build_with_chromium) { if (is_android) { deps += [ ":android_junit_tests", - "//webrtc/sdk/android:libjingle_peerconnection_android_unittest", + "sdk/android:libjingle_peerconnection_android_unittest", ] } else { deps += [ "modules/video_capture:video_capture_tests" ] @@ -422,8 +422,8 @@ if (rtc_include_tests) { # TODO(pbos): Rename test suite, this is no longer "just" for video targets. video_engine_tests_resources = [ - "//resources/foreman_cif_short.yuv", - "//resources/voice_engine/audio_long16.pcm", + "../resources/foreman_cif_short.yuv", + "../resources/voice_engine/audio_long16.pcm", ] if (is_ios) { @@ -466,19 +466,19 @@ if (rtc_include_tests) { } webrtc_perf_tests_resources = [ - "//resources/audio_coding/speech_mono_16kHz.pcm", - "//resources/audio_coding/speech_mono_32_48kHz.pcm", - "//resources/audio_coding/testfile32kHz.pcm", - "//resources/ConferenceMotion_1280_720_50.yuv", - "//resources/difficult_photo_1850_1110.yuv", - "//resources/foreman_cif.yuv", - "//resources/google-wifi-3mbps.rx", - "//resources/paris_qcif.yuv", - "//resources/photo_1850_1110.yuv", - "//resources/presentation_1850_1110.yuv", - "//resources/verizon4g-downlink.rx", - "//resources/voice_engine/audio_long16.pcm", - "//resources/web_screenshot_1850_1110.yuv", + "../resources/audio_coding/speech_mono_16kHz.pcm", + "../resources/audio_coding/speech_mono_32_48kHz.pcm", + "../resources/audio_coding/testfile32kHz.pcm", + "../resources/ConferenceMotion_1280_720_50.yuv", + "../resources/difficult_photo_1850_1110.yuv", + "../resources/foreman_cif.yuv", + "../resources/google-wifi-3mbps.rx", + "../resources/paris_qcif.yuv", + "../resources/photo_1850_1110.yuv", + "../resources/presentation_1850_1110.yuv", + "../resources/verizon4g-downlink.rx", + "../resources/voice_engine/audio_long16.pcm", + "../resources/web_screenshot_1850_1110.yuv", ] if (is_ios) { @@ -535,9 +535,9 @@ if (rtc_include_tests) { ] deps = [ + "examples:AppRTCMobile_javalib", + "sdk/android:libjingle_peerconnection_java", "//base:base_java_test_support", - "//webrtc/examples:AppRTCMobile_javalib", - "//webrtc/sdk/android:libjingle_peerconnection_java", ] } } diff --git a/webrtc/api/BUILD.gn b/webrtc/api/BUILD.gn index 249411b1c2..e87509bced 100644 --- a/webrtc/api/BUILD.gn +++ b/webrtc/api/BUILD.gn @@ -222,8 +222,8 @@ if (rtc_include_tests) { ] deps = [ + "../test:test_support", "//testing/gmock", - "//webrtc/test:test_support", ] } @@ -250,7 +250,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:rtc_unittests" ] + visibility = [ "..:rtc_unittests" ] } sources = [ "ortc/mediadescription_unittest.cc", @@ -266,7 +266,7 @@ if (rtc_include_tests) { deps = [ ":libjingle_peerconnection_api", ":ortc_api", - "//webrtc/test:test_support", + "../test:test_support", ] } } diff --git a/webrtc/audio/BUILD.gn b/webrtc/audio/BUILD.gn index 1577316cd4..5296f1fa82 100644 --- a/webrtc/audio/BUILD.gn +++ b/webrtc/audio/BUILD.gn @@ -62,7 +62,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:video_engine_tests" ] + visibility = [ "..:video_engine_tests" ] } # TODO(kjellander): Remove (bugs.webrtc.org/6828) @@ -120,8 +120,8 @@ if (rtc_include_tests) { } data = [ - "//resources/voice_engine/audio_tiny16.wav", - "//resources/voice_engine/audio_tiny48.wav", + "../../resources/voice_engine/audio_tiny16.wav", + "../../resources/voice_engine/audio_tiny48.wav", ] if (!build_with_chromium && is_clang) { diff --git a/webrtc/call/BUILD.gn b/webrtc/call/BUILD.gn index 6a50ea09a2..c26c761a10 100644 --- a/webrtc/call/BUILD.gn +++ b/webrtc/call/BUILD.gn @@ -130,7 +130,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:video_engine_tests" ] + visibility = [ "..:video_engine_tests" ] } sources = [ "bitrate_allocator_unittest.cc", @@ -180,7 +180,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 = [ "call_perf_tests.cc", @@ -200,13 +200,13 @@ if (rtc_include_tests) { "../system_wrappers:metrics_default", "../test:direct_transport", "../test:fake_audio_device", + "../test:field_trial", + "../test:test_common", "../test:test_support", "../test:video_test_common", "../video", "../voice_engine", "//testing/gtest", - "//webrtc/test:field_trial", - "//webrtc/test:test_common", ] if (!build_with_chromium && is_clang) { # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). diff --git a/webrtc/common_video/BUILD.gn b/webrtc/common_video/BUILD.gn index 68b4934317..8f0afabdc3 100644 --- a/webrtc/common_video/BUILD.gn +++ b/webrtc/common_video/BUILD.gn @@ -77,7 +77,7 @@ rtc_static_library("common_video") { } if (rtc_include_tests) { - common_video_resources = [ "//resources/foreman_cif.yuv" ] + common_video_resources = [ "../../resources/foreman_cif.yuv" ] if (is_ios) { bundle_data("common_video_unittests_bundle_data") { diff --git a/webrtc/examples/BUILD.gn b/webrtc/examples/BUILD.gn index 85813fa222..726b5ba0a5 100644 --- a/webrtc/examples/BUILD.gn +++ b/webrtc/examples/BUILD.gn @@ -57,11 +57,11 @@ if (is_android) { deps = [ ":AppRTCMobile_javalib", ":AppRTCMobile_resources", + "../rtc_base:base_java", "//base:base_java", - "//webrtc/rtc_base:base_java", ] - shared_libraries = [ "//webrtc/sdk/android:libjingle_peerconnection_so" ] + shared_libraries = [ "../sdk/android:libjingle_peerconnection_so" ] } android_library("AppRTCMobile_javalib") { @@ -94,11 +94,11 @@ if (is_android) { deps = [ ":AppRTCMobile_resources", - "//webrtc/examples/androidapp/third_party/autobanh:autobanh_java", - "//webrtc/modules/audio_device:audio_device_java", - "//webrtc/rtc_base:base_java", - "//webrtc/sdk/android:libjingle_peerconnection_java", - "//webrtc/sdk/android:libjingle_peerconnection_metrics_default_java", + "../modules/audio_device:audio_device_java", + "../rtc_base:base_java", + "../sdk/android:libjingle_peerconnection_java", + "../sdk/android:libjingle_peerconnection_metrics_default_java", + "androidapp/third_party/autobanh:autobanh_java", ] } @@ -118,10 +118,10 @@ if (is_android) { deps = [ ":AppRTCMobile_javalib", + "../sdk/android:libjingle_peerconnection_java", "//base:base_java_test_support", "//third_party/android_support_test_runner:runner_java", "//third_party/junit", - "//webrtc/sdk/android:libjingle_peerconnection_java", ] } @@ -135,16 +135,16 @@ if (is_android) { deps = [ ":AppRTCMobile_javalib", + "../sdk/android:libjingle_peerconnection_java", "//third_party/android_support_test_runner:rules_java", "//third_party/android_support_test_runner:runner_java", "//third_party/espresso:espresso_all_java", "//third_party/hamcrest:hamcrest_java", "//third_party/junit", - "//webrtc/sdk/android:libjingle_peerconnection_java", ] data = [ - "//resources/reference_video_640x360_30fps.y4m", + "../../resources/reference_video_640x360_30fps.y4m", ] } } @@ -163,13 +163,13 @@ if (is_ios || (is_mac && target_cpu != "x86")) { public_configs = [ ":apprtc_common_config" ] deps = [ - "//webrtc/system_wrappers:field_trial_default", - "//webrtc/system_wrappers:metrics_default", + "../system_wrappers:field_trial_default", + "../system_wrappers:metrics_default", ] if (is_ios) { deps += [ ":AppRTCMobile_ios_frameworks" ] } else { - deps += [ "//webrtc/sdk:objc_common" ] + deps += [ "../sdk:objc_common" ] } } @@ -239,7 +239,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) { deps += [ ":AppRTCMobile_ios_frameworks" ] } else { public_deps = [ - "//webrtc/sdk:objc_peerconnection", + "../sdk:objc_peerconnection", ] } libs = [ "QuartzCore.framework" ] @@ -298,7 +298,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) { bundle_data("AppRTCMobile_ios_frameworks") { public_deps = [ - "//webrtc/sdk:objc_framework+link", + "../sdk:objc_framework+link", ] sources = [ "$root_out_dir/WebRTC.framework", @@ -342,11 +342,11 @@ if (is_ios || (is_mac && target_cpu != "x86")) { "objc/AppRTCMobile/mac/APPRTCViewController.h", "objc/AppRTCMobile/mac/APPRTCViewController.m", ] - configs += [ "//webrtc:common_objc" ] + configs += [ "..:common_objc" ] deps = [ ":apprtc_common", ":apprtc_signaling", - "//webrtc/sdk:objc_ui", + "../sdk:objc_ui", ] } @@ -422,7 +422,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) { "objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm", ] deps = [ - "//webrtc/base:rtc_base", + "../rtc_base:rtc_base", ] public_deps = [ ":AppRTCMobile_ios_frameworks", @@ -501,7 +501,7 @@ if (is_linux || is_win) { ] cflags = [ "/wd4245" ] configs += [ "//build/config/win:windowed" ] - deps += [ "//webrtc/media:rtc_media_base" ] + deps += [ "../media:rtc_media_base" ] } if (is_linux) { sources += [ @@ -521,17 +521,17 @@ if (is_linux || is_win) { configs += [ ":peerconnection_client_warnings_config" ] deps += [ + "../api:libjingle_peerconnection_test_api", + "../api:video_frame_api", + "../base:rtc_base", + "../base:rtc_base_approved", + "../base:rtc_json", + "../media:rtc_media", + "../modules/video_capture:video_capture_module", + "../pc:libjingle_peerconnection", + "../system_wrappers:field_trial_default", + "../system_wrappers:metrics_default", "//third_party/libyuv", - "//webrtc/api:libjingle_peerconnection_test_api", - "//webrtc/api:video_frame_api", - "//webrtc/base:rtc_base", - "//webrtc/base:rtc_base_approved", - "//webrtc/base:rtc_json", - "//webrtc/media:rtc_media", - "//webrtc/modules/video_capture:video_capture_module", - "//webrtc/pc:libjingle_peerconnection", - "//webrtc/system_wrappers:field_trial_default", - "//webrtc/system_wrappers:metrics_default", ] } @@ -547,6 +547,9 @@ if (is_linux || is_win) { "peerconnection/server/utils.h", ] deps = [ + "..:webrtc_common", + "../base:rtc_base_approved", + "../rtc_tools:command_line_parser", "//webrtc:webrtc_common", "//webrtc/base:rtc_base_approved", "//webrtc/rtc_tools:command_line_parser", @@ -563,11 +566,11 @@ if (is_linux || is_win) { ] deps = [ "../base:rtc_base", - "//webrtc/base:rtc_base_approved", - "//webrtc/p2p:rtc_p2p", - "//webrtc/pc:rtc_pc", - "//webrtc/system_wrappers:field_trial_default", - "//webrtc/system_wrappers:metrics_default", + "../base:rtc_base_approved", + "../p2p:rtc_p2p", + "../pc:rtc_pc", + "../system_wrappers:field_trial_default", + "../system_wrappers:metrics_default", ] if (!build_with_chromium && is_clang) { # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). @@ -581,11 +584,11 @@ if (is_linux || is_win) { ] deps = [ "../base:rtc_base", - "//webrtc/base:rtc_base_approved", - "//webrtc/p2p:rtc_p2p", - "//webrtc/pc:rtc_pc", - "//webrtc/system_wrappers:field_trial_default", - "//webrtc/system_wrappers:metrics_default", + "../base:rtc_base_approved", + "../p2p:rtc_p2p", + "../pc:rtc_pc", + "../system_wrappers:field_trial_default", + "../system_wrappers:metrics_default", ] if (!build_with_chromium && is_clang) { # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). @@ -599,11 +602,11 @@ if (is_linux || is_win) { ] deps = [ "../base:rtc_base", - "//webrtc/base:rtc_base_approved", - "//webrtc/p2p:rtc_p2p", - "//webrtc/pc:rtc_pc", - "//webrtc/system_wrappers:field_trial_default", - "//webrtc/system_wrappers:metrics_default", + "../base:rtc_base_approved", + "../p2p:rtc_p2p", + "../pc:rtc_pc", + "../system_wrappers:field_trial_default", + "../system_wrappers:metrics_default", ] if (!build_with_chromium && is_clang) { # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). @@ -631,17 +634,17 @@ if (is_win) { ":peerconnection_client_warnings_config", ] deps = [ - "//webrtc/api:libjingle_peerconnection_test_api", - "//webrtc/api:video_frame_api", - "//webrtc/base:rtc_base", - "//webrtc/base:rtc_base_approved", - "//webrtc/base:rtc_json", - "//webrtc/media:rtc_media", - "//webrtc/media:rtc_media_base", - "//webrtc/modules/video_capture:video_capture_module", - "//webrtc/pc:libjingle_peerconnection", - "//webrtc/system_wrappers:field_trial_default", - "//webrtc/system_wrappers:metrics_default", + "../api:libjingle_peerconnection_test_api", + "../api:video_frame_api", + "../base:rtc_base", + "../base:rtc_base_approved", + "../base:rtc_json", + "../media:rtc_media", + "../media:rtc_media_base", + "../modules/video_capture:video_capture_module", + "../pc:libjingle_peerconnection", + "../system_wrappers:field_trial_default", + "../system_wrappers:metrics_default", ] } } diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn index fad410b2dd..cb5bf2b9fe 100644 --- a/webrtc/media/BUILD.gn +++ b/webrtc/media/BUILD.gn @@ -397,13 +397,13 @@ if (rtc_include_tests) { } rtc_media_unittests_resources = [ - "//resources/media/captured-320x240-2s-48.frames", - "//resources/media/faces.1280x720_P420.yuv", - "//resources/media/faces_I420.jpg", - "//resources/media/faces_I422.jpg", - "//resources/media/faces_I444.jpg", - "//resources/media/faces_I411.jpg", - "//resources/media/faces_I400.jpg", + "../../resources/media/captured-320x240-2s-48.frames", + "../../resources/media/faces.1280x720_P420.yuv", + "../../resources/media/faces_I420.jpg", + "../../resources/media/faces_I422.jpg", + "../../resources/media/faces_I444.jpg", + "../../resources/media/faces_I411.jpg", + "../../resources/media/faces_I400.jpg", ] if (is_ios) { diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn index 258683165d..94e2d4fa53 100644 --- a/webrtc/modules/BUILD.gn +++ b/webrtc/modules/BUILD.gn @@ -43,10 +43,10 @@ rtc_source_set("module_api") { if (rtc_include_tests) { modules_tests_resources = [ - "//resources/audio_coding/testfile32kHz.pcm", - "//resources/audio_coding/teststereo32kHz.pcm", - "//resources/foreman_cif.yuv", - "//resources/paris_qcif.yuv", + "../../resources/audio_coding/testfile32kHz.pcm", + "../../resources/audio_coding/teststereo32kHz.pcm", + "../../resources/foreman_cif.yuv", + "../../resources/paris_qcif.yuv", ] if (is_ios) { @@ -99,104 +99,104 @@ if (rtc_include_tests) { } modules_unittests_resources = [ - "//resources/att-downlink.rx", - "//resources/att-uplink.rx", - "//resources/audio_coding/neteq_opus.rtp", - "//resources/audio_coding/neteq_universal_new.rtp", - "//resources/audio_coding/speech_mono_16kHz.pcm", - "//resources/audio_coding/speech_mono_32_48kHz.pcm", - "//resources/audio_coding/testfile32kHz.pcm", - "//resources/audio_coding/teststereo32kHz.pcm", - "//resources/audio_device/audio_short16.pcm", - "//resources/audio_device/audio_short44.pcm", - "//resources/audio_device/audio_short48.pcm", - "//resources/audio_processing/agc/agc_audio.pcm", - "//resources/audio_processing/agc/agc_no_circular_buffer.dat", - "//resources/audio_processing/agc/agc_pitch_gain.dat", - "//resources/audio_processing/agc/agc_pitch_lag.dat", - "//resources/audio_processing/agc/agc_spectral_peak.dat", - "//resources/audio_processing/agc/agc_vad.dat", - "//resources/audio_processing/agc/agc_voicing_prob.dat", - "//resources/audio_processing/agc/agc_with_circular_buffer.dat", - "//resources/audio_processing/output_data_fixed.pb", - "//resources/audio_processing/output_data_float.pb", - "//resources/audio_processing/output_data_mac.pb", - "//resources/audio_processing/transient/ajm-macbook-1-spke16m.pcm", - "//resources/audio_processing/transient/audio16kHz.pcm", - "//resources/audio_processing/transient/audio32kHz.pcm", - "//resources/audio_processing/transient/audio48kHz.pcm", - "//resources/audio_processing/transient/audio8kHz.pcm", - "//resources/audio_processing/transient/detect16kHz.dat", - "//resources/audio_processing/transient/detect32kHz.dat", - "//resources/audio_processing/transient/detect48kHz.dat", - "//resources/audio_processing/transient/detect8kHz.dat", - "//resources/audio_processing/transient/double-utils.dat", - "//resources/audio_processing/transient/float-utils.dat", - "//resources/audio_processing/transient/suppressed16kHz.pcm", - "//resources/audio_processing/transient/suppressed32kHz.pcm", - "//resources/audio_processing/transient/suppressed8kHz.pcm", - "//resources/audio_processing/transient/wpd0.dat", - "//resources/audio_processing/transient/wpd1.dat", - "//resources/audio_processing/transient/wpd2.dat", - "//resources/audio_processing/transient/wpd3.dat", - "//resources/audio_processing/transient/wpd4.dat", - "//resources/audio_processing/transient/wpd5.dat", - "//resources/audio_processing/transient/wpd6.dat", - "//resources/audio_processing/transient/wpd7.dat", - "//resources/deflicker_before_cif_short.yuv", - "//resources/far16_stereo.pcm", - "//resources/far32_stereo.pcm", - "//resources/far44_stereo.pcm", - "//resources/far48_stereo.pcm", - "//resources/far8_stereo.pcm", - "//resources/foremanColorEnhanced_cif_short.yuv", - "//resources/foreman_cif.yuv", - "//resources/foreman_cif_short.yuv", - "//resources/near16_stereo.pcm", - "//resources/near32_stereo.pcm", - "//resources/near44_stereo.pcm", - "//resources/near48_stereo.pcm", - "//resources/near8_stereo.pcm", - "//resources/ref03.aecdump", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_AST.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_TOF.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_AST.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_TOF.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_AST.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_TOF.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_AST.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_TOF.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_AST.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_TOF.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_AST.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_TOF.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_AST.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_TOF.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_AST.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_TOF.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_AST.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_TOF.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_AST.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_TOF.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_AST.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_TOF.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_AST.bin", - "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_TOF.bin", - "//resources/short_mixed_mono_48.dat", - "//resources/short_mixed_mono_48_arm.dat", - "//resources/short_mixed_mono_48.pcm", - "//resources/short_mixed_stereo_48.dat", - "//resources/short_mixed_stereo_48.pcm", - "//resources/sprint-downlink.rx", - "//resources/sprint-uplink.rx", - "//resources/synthetic-trace.rx", - "//resources/tmobile-downlink.rx", - "//resources/tmobile-uplink.rx", - "//resources/verizon3g-downlink.rx", - "//resources/verizon3g-uplink.rx", - "//resources/verizon4g-downlink.rx", - "//resources/verizon4g-uplink.rx", - "//resources/voice_engine/audio_tiny48.wav", + "../../resources/att-downlink.rx", + "../../resources/att-uplink.rx", + "../../resources/audio_coding/neteq_opus.rtp", + "../../resources/audio_coding/neteq_universal_new.rtp", + "../../resources/audio_coding/speech_mono_16kHz.pcm", + "../../resources/audio_coding/speech_mono_32_48kHz.pcm", + "../../resources/audio_coding/testfile32kHz.pcm", + "../../resources/audio_coding/teststereo32kHz.pcm", + "../../resources/audio_device/audio_short16.pcm", + "../../resources/audio_device/audio_short44.pcm", + "../../resources/audio_device/audio_short48.pcm", + "../../resources/audio_processing/agc/agc_audio.pcm", + "../../resources/audio_processing/agc/agc_no_circular_buffer.dat", + "../../resources/audio_processing/agc/agc_pitch_gain.dat", + "../../resources/audio_processing/agc/agc_pitch_lag.dat", + "../../resources/audio_processing/agc/agc_spectral_peak.dat", + "../../resources/audio_processing/agc/agc_vad.dat", + "../../resources/audio_processing/agc/agc_voicing_prob.dat", + "../../resources/audio_processing/agc/agc_with_circular_buffer.dat", + "../../resources/audio_processing/output_data_fixed.pb", + "../../resources/audio_processing/output_data_float.pb", + "../../resources/audio_processing/output_data_mac.pb", + "../../resources/audio_processing/transient/ajm-macbook-1-spke16m.pcm", + "../../resources/audio_processing/transient/audio16kHz.pcm", + "../../resources/audio_processing/transient/audio32kHz.pcm", + "../../resources/audio_processing/transient/audio48kHz.pcm", + "../../resources/audio_processing/transient/audio8kHz.pcm", + "../../resources/audio_processing/transient/detect16kHz.dat", + "../../resources/audio_processing/transient/detect32kHz.dat", + "../../resources/audio_processing/transient/detect48kHz.dat", + "../../resources/audio_processing/transient/detect8kHz.dat", + "../../resources/audio_processing/transient/double-utils.dat", + "../../resources/audio_processing/transient/float-utils.dat", + "../../resources/audio_processing/transient/suppressed16kHz.pcm", + "../../resources/audio_processing/transient/suppressed32kHz.pcm", + "../../resources/audio_processing/transient/suppressed8kHz.pcm", + "../../resources/audio_processing/transient/wpd0.dat", + "../../resources/audio_processing/transient/wpd1.dat", + "../../resources/audio_processing/transient/wpd2.dat", + "../../resources/audio_processing/transient/wpd3.dat", + "../../resources/audio_processing/transient/wpd4.dat", + "../../resources/audio_processing/transient/wpd5.dat", + "../../resources/audio_processing/transient/wpd6.dat", + "../../resources/audio_processing/transient/wpd7.dat", + "../../resources/deflicker_before_cif_short.yuv", + "../../resources/far16_stereo.pcm", + "../../resources/far32_stereo.pcm", + "../../resources/far44_stereo.pcm", + "../../resources/far48_stereo.pcm", + "../../resources/far8_stereo.pcm", + "../../resources/foremanColorEnhanced_cif_short.yuv", + "../../resources/foreman_cif.yuv", + "../../resources/foreman_cif_short.yuv", + "../../resources/near16_stereo.pcm", + "../../resources/near32_stereo.pcm", + "../../resources/near44_stereo.pcm", + "../../resources/near48_stereo.pcm", + "../../resources/near8_stereo.pcm", + "../../resources/ref03.aecdump", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_AST.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_TOF.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_AST.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_TOF.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_AST.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_TOF.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_AST.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_TOF.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_AST.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_TOF.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_AST.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_TOF.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_AST.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_TOF.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_AST.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_TOF.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_AST.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_TOF.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_AST.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_TOF.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_AST.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_TOF.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_AST.bin", + "../../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_TOF.bin", + "../../resources/short_mixed_mono_48.dat", + "../../resources/short_mixed_mono_48_arm.dat", + "../../resources/short_mixed_mono_48.pcm", + "../../resources/short_mixed_stereo_48.dat", + "../../resources/short_mixed_stereo_48.pcm", + "../../resources/sprint-downlink.rx", + "../../resources/sprint-uplink.rx", + "../../resources/synthetic-trace.rx", + "../../resources/tmobile-downlink.rx", + "../../resources/tmobile-uplink.rx", + "../../resources/verizon3g-downlink.rx", + "../../resources/verizon3g-uplink.rx", + "../../resources/verizon4g-downlink.rx", + "../../resources/verizon4g-uplink.rx", + "../../resources/voice_engine/audio_tiny48.wav", ] if (is_ios) { bundle_data("modules_unittests_bundle_data") { @@ -245,13 +245,13 @@ if (rtc_include_tests) { if (is_android) { deps += [ + "../sdk/android:libjingle_peerconnection_java", "//testing/android/native_test:native_test_support", - "//webrtc/sdk/android:libjingle_peerconnection_java", ] shard_timeout = 900 } if (is_ios) { - info_plist = "//webrtc/test/ios/Info.plist" + info_plist = "../test/ios/Info.plist" deps += [ ":modules_unittests_bundle_data" ] configs += [ "..:common_objc" ] ldflags = [ "-ObjC" ] diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn index d5b669c0eb..3ea92151e9 100644 --- a/webrtc/modules/audio_coding/BUILD.gn +++ b/webrtc/modules/audio_coding/BUILD.gn @@ -1264,7 +1264,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_tests" ] + visibility = [ "..:modules_tests" ] } sources = [ "test/ACMTest.h", @@ -1331,7 +1331,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 = [ "codecs/opus/opus_complexity_unittest.cc", @@ -1453,7 +1453,7 @@ if (rtc_include_tests) { } # insert_packet_with_timing audio_decoder_unittests_resources = - [ "//resources/audio_coding/testfile32kHz.pcm" ] + [ "../../../resources/audio_coding/testfile32kHz.pcm" ] if (is_ios) { bundle_data("audio_decoder_unittests_bundle_data") { @@ -2061,7 +2061,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 = [ "acm2/acm_receiver_unittest.cc", diff --git a/webrtc/modules/audio_conference_mixer/BUILD.gn b/webrtc/modules/audio_conference_mixer/BUILD.gn index 8939da222e..ab2fc0d80b 100644 --- a/webrtc/modules/audio_conference_mixer/BUILD.gn +++ b/webrtc/modules/audio_conference_mixer/BUILD.gn @@ -56,7 +56,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 = [ "test/audio_conference_mixer_unittest.cc", diff --git a/webrtc/modules/audio_device/BUILD.gn b/webrtc/modules/audio_device/BUILD.gn index c565165192..2c262ba962 100644 --- a/webrtc/modules/audio_device/BUILD.gn +++ b/webrtc/modules/audio_device/BUILD.gn @@ -273,7 +273,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 = [ "fine_audio_buffer_unittest.cc", @@ -304,7 +304,7 @@ if (rtc_include_tests) { ] deps += [ "../../../base", - "//webrtc/sdk/android:libjingle_peerconnection_java", + "../../sdk/android:libjingle_peerconnection_java", ] } if (is_ios && !use_ios_simulator) { @@ -355,7 +355,7 @@ if (!build_with_chromium && is_android) { "android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java", ] deps = [ - "//webrtc/rtc_base:base_java", + "../../rtc_base:base_java", ] } } diff --git a/webrtc/modules/audio_mixer/BUILD.gn b/webrtc/modules/audio_mixer/BUILD.gn index 862a258a7f..b6569f72b0 100644 --- a/webrtc/modules/audio_mixer/BUILD.gn +++ b/webrtc/modules/audio_mixer/BUILD.gn @@ -73,7 +73,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 = [ "audio_frame_manipulator_unittest.cc", diff --git a/webrtc/modules/audio_processing/BUILD.gn b/webrtc/modules/audio_processing/BUILD.gn index 3af019e49e..92a8f177a0 100644 --- a/webrtc/modules/audio_processing/BUILD.gn +++ b/webrtc/modules/audio_processing/BUILD.gn @@ -507,7 +507,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 = [ "aec/echo_cancellation_unittest.cc", @@ -686,7 +686,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 = [ "audio_processing_performance_unittest.cc", diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/BUILD.gn b/webrtc/modules/audio_processing/test/py_quality_assessment/BUILD.gn index 154219bf53..2d1b1dbd33 100644 --- a/webrtc/modules/audio_processing/test/py_quality_assessment/BUILD.gn +++ b/webrtc/modules/audio_processing/test/py_quality_assessment/BUILD.gn @@ -33,7 +33,7 @@ copy("scripts") { ":lib", ":output", "../..:audioproc_f", - "//resources/audio_processing/test/py_quality_assessment:probing_signals", + "../../../../../resources/audio_processing/test/py_quality_assessment:probing_signals", ] } @@ -71,7 +71,7 @@ copy("lib") { "$root_build_dir/py_quality_assessment/quality_assessment/{{source_file_part}}", ] deps = [ - "//resources/audio_processing/test/py_quality_assessment:noise_tracks", + "../../../../../resources/audio_processing/test/py_quality_assessment:noise_tracks", ] } @@ -104,8 +104,8 @@ rtc_executable("fake_polqa") { visibility = [ ":*" ] # Only targets in this file can depend on this. output_name = "py_quality_assessment/quality_assessment/fake_polqa" deps = [ - "//webrtc:webrtc_common", - "//webrtc/base:rtc_base_approved", + "../../../..:webrtc_common", + "../../../../base:rtc_base_approved", ] } diff --git a/webrtc/modules/bitrate_controller/BUILD.gn b/webrtc/modules/bitrate_controller/BUILD.gn index 33a28869ba..4ab057a2ee 100644 --- a/webrtc/modules/bitrate_controller/BUILD.gn +++ b/webrtc/modules/bitrate_controller/BUILD.gn @@ -51,7 +51,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 = [ "bitrate_controller_unittest.cc", diff --git a/webrtc/modules/congestion_controller/BUILD.gn b/webrtc/modules/congestion_controller/BUILD.gn index ef45297031..dbfd56b445 100644 --- a/webrtc/modules/congestion_controller/BUILD.gn +++ b/webrtc/modules/congestion_controller/BUILD.gn @@ -70,7 +70,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 = [ "congestion_controller_unittest.cc", diff --git a/webrtc/modules/desktop_capture/BUILD.gn b/webrtc/modules/desktop_capture/BUILD.gn index 93ceb752c2..f7d6f472da 100644 --- a/webrtc/modules/desktop_capture/BUILD.gn +++ b/webrtc/modules/desktop_capture/BUILD.gn @@ -40,7 +40,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_tests" ] + visibility = [ "..:modules_tests" ] } sources = [] deps = [] @@ -69,7 +69,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 = [ "blank_detector_desktop_capturer_wrapper_unittest.cc", diff --git a/webrtc/modules/media_file/BUILD.gn b/webrtc/modules/media_file/BUILD.gn index 7ab897f28f..baea158e23 100644 --- a/webrtc/modules/media_file/BUILD.gn +++ b/webrtc/modules/media_file/BUILD.gn @@ -49,7 +49,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 = [ "media_file_unittest.cc", diff --git a/webrtc/modules/pacing/BUILD.gn b/webrtc/modules/pacing/BUILD.gn index 57126d7143..cf5bc86181 100644 --- a/webrtc/modules/pacing/BUILD.gn +++ b/webrtc/modules/pacing/BUILD.gn @@ -45,7 +45,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 = [ "alr_detector_unittest.cc", diff --git a/webrtc/modules/remote_bitrate_estimator/BUILD.gn b/webrtc/modules/remote_bitrate_estimator/BUILD.gn index 5a3afc65fd..5a4c688431 100644 --- a/webrtc/modules/remote_bitrate_estimator/BUILD.gn +++ b/webrtc/modules/remote_bitrate_estimator/BUILD.gn @@ -139,7 +139,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 = [ "remote_bitrate_estimators_test.cc", @@ -163,7 +163,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 = [ "aimd_rate_control_unittest.cc", diff --git a/webrtc/modules/rtp_rtcp/BUILD.gn b/webrtc/modules/rtp_rtcp/BUILD.gn index dc623cefb4..91bfd854e1 100644 --- a/webrtc/modules/rtp_rtcp/BUILD.gn +++ b/webrtc/modules/rtp_rtcp/BUILD.gn @@ -237,8 +237,8 @@ if (rtc_include_tests) { deps = [ ":rtp_rtcp", + "../../test:test_main", "//testing/gtest", - "//webrtc/test:test_main", ] } # test_packet_masks_metrics @@ -249,7 +249,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_tests" ] + visibility = [ "../../modules:modules_tests" ] } sources = [ "test/testFec/test_fec.cc", diff --git a/webrtc/modules/utility/BUILD.gn b/webrtc/modules/utility/BUILD.gn index 71238905dc..54730a7652 100644 --- a/webrtc/modules/utility/BUILD.gn +++ b/webrtc/modules/utility/BUILD.gn @@ -48,7 +48,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/process_thread_impl_unittest.cc", diff --git a/webrtc/modules/video_capture/BUILD.gn b/webrtc/modules/video_capture/BUILD.gn index 5865688e20..b908923d6e 100644 --- a/webrtc/modules/video_capture/BUILD.gn +++ b/webrtc/modules/video_capture/BUILD.gn @@ -183,7 +183,7 @@ if (!build_with_chromium) { "../utility", "//testing/gtest", ] - deps += [ "//webrtc/test:test_main" ] + deps += [ "../../test:test_main" ] if (!build_with_chromium && is_clang) { # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn index 67c8ccd239..8d15e8b724 100644 --- a/webrtc/modules/video_coding/BUILD.gn +++ b/webrtc/modules/video_coding/BUILD.gn @@ -412,7 +412,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_tests" ] + visibility = [ "..:modules_tests" ] } sources = [ "codecs/h264/test/h264_impl_unittest.cc", @@ -446,11 +446,11 @@ if (rtc_include_tests) { } plot_videoprocessor_integrationtest_resources = [ - "//resources/foreman_128x96.yuv", - "//resources/foreman_160x120.yuv", - "//resources/foreman_176x144.yuv", - "//resources/foreman_320x240.yuv", - "//resources/foreman_cif.yuv", + "../../../resources/foreman_128x96.yuv", + "../../../resources/foreman_160x120.yuv", + "../../../resources/foreman_176x144.yuv", + "../../../resources/foreman_320x240.yuv", + "../../../resources/foreman_cif.yuv", ] if (is_ios || is_mac) { @@ -519,7 +519,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 = [ "codecs/test/packet_manipulator_unittest.cc", diff --git a/webrtc/modules/video_processing/BUILD.gn b/webrtc/modules/video_processing/BUILD.gn index c4c9c3b894..3f0fb76a1b 100644 --- a/webrtc/modules/video_processing/BUILD.gn +++ b/webrtc/modules/video_processing/BUILD.gn @@ -107,7 +107,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 = [ "test/denoiser_test.cc", diff --git a/webrtc/p2p/BUILD.gn b/webrtc/p2p/BUILD.gn index f7d59058ba..daa2d8498e 100644 --- a/webrtc/p2p/BUILD.gn +++ b/webrtc/p2p/BUILD.gn @@ -170,7 +170,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:rtc_unittests" ] + visibility = [ "..:rtc_unittests" ] } sources = [ "base/asyncstuntcpsocket_unittest.cc", @@ -250,7 +250,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:rtc_unittests" ] + visibility = [ "..:rtc_unittests" ] } sources = [ "stunprober/stunprober_unittest.cc", diff --git a/webrtc/pc/BUILD.gn b/webrtc/pc/BUILD.gn index 2ff1a0af50..783fd67a55 100644 --- a/webrtc/pc/BUILD.gn +++ b/webrtc/pc/BUILD.gn @@ -431,9 +431,9 @@ if (rtc_include_tests) { "test/androidtestinitializer.h", ] deps += [ + "../sdk/android:libjingle_peerconnection_java", + "../sdk/android:libjingle_peerconnection_jni", "//testing/android/native_test:native_test_support", - "//webrtc/sdk/android:libjingle_peerconnection_java", - "//webrtc/sdk/android:libjingle_peerconnection_jni", ] } diff --git a/webrtc/rtc_tools/BUILD.gn b/webrtc/rtc_tools/BUILD.gn index e224380cc7..fac42f389b 100644 --- a/webrtc/rtc_tools/BUILD.gn +++ b/webrtc/rtc_tools/BUILD.gn @@ -275,9 +275,9 @@ if (rtc_include_tests) { } tools_unittests_resources = [ - "//resources/foreman_cif.yuv", - "//resources/reference_less_video_test_file.y4m", - "//resources/video_quality_analysis_frame.txt", + "../../resources/foreman_cif.yuv", + "../../resources/reference_less_video_test_file.y4m", + "../../resources/video_quality_analysis_frame.txt", ] if (is_ios) { diff --git a/webrtc/rtc_tools/network_tester/BUILD.gn b/webrtc/rtc_tools/network_tester/BUILD.gn index bd069d6109..4a262fc9be 100644 --- a/webrtc/rtc_tools/network_tester/BUILD.gn +++ b/webrtc/rtc_tools/network_tester/BUILD.gn @@ -54,8 +54,8 @@ if (rtc_enable_protobuf) { } network_tester_unittests_resources = [ - "//resources/network_tester/client_config.dat", - "//resources/network_tester/server_config.dat", + "../../../resources/network_tester/client_config.dat", + "../../../resources/network_tester/server_config.dat", ] if (is_ios) { @@ -75,7 +75,7 @@ if (rtc_enable_protobuf) { # 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/rtc_tools:tools_unittests" ] + visibility = [ "..:tools_unittests" ] } sources = [ "network_tester_unittest.cc", @@ -83,9 +83,9 @@ if (rtc_enable_protobuf) { deps = [ ":network_tester", + "../../base:rtc_base_tests_utils", + "../../test:test_support", "//testing/gtest", - "//webrtc/base:rtc_base_tests_utils", - "//webrtc/test:test_support", ] if (is_ios) { @@ -130,11 +130,11 @@ if (is_android) { deps = [ ":NetworkTesterMobile_javalib", ":NetworkTesterMobile_resources", + "../../rtc_base:base_java", "//base:base_java", - "//webrtc/rtc_base:base_java", ] - shared_libraries = [ "//webrtc/rtc_tools/network_tester:network_tester_so" ] + shared_libraries = [ "../../rtc_tools/network_tester:network_tester_so" ] } android_library("NetworkTesterMobile_javalib") { @@ -148,7 +148,7 @@ if (is_android) { deps = [ ":NetworkTesterMobile_resources", - "//webrtc/rtc_base:base_java", + "../../rtc_base:base_java", ] } diff --git a/webrtc/sdk/android/BUILD.gn b/webrtc/sdk/android/BUILD.gn index 689d6cfb40..1291e52a6d 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.gni") import("//build/config/android/config.gni") import("//build/config/android/rules.gni") @@ -48,10 +48,10 @@ rtc_source_set("base_jni") { ] deps = [ - "//webrtc/api:libjingle_peerconnection_api", - "//webrtc/base:rtc_base", - "//webrtc/base:rtc_base_approved", - "//webrtc/system_wrappers:metrics_api", + "../../api:libjingle_peerconnection_api", + "../../base:rtc_base", + "../../base:rtc_base_approved", + "../../system_wrappers:metrics_api", ] if (is_clang) { @@ -70,9 +70,9 @@ rtc_static_library("audio_jni") { deps = [ ":base_jni", - "//webrtc/api/audio_codecs:builtin_audio_decoder_factory", - "//webrtc/api/audio_codecs:builtin_audio_encoder_factory", - "//webrtc/voice_engine:voice_engine", + "../../api/audio_codecs:builtin_audio_decoder_factory", + "../../api/audio_codecs:builtin_audio_encoder_factory", + "../../voice_engine:voice_engine", ] } @@ -135,21 +135,21 @@ rtc_static_library("video_jni") { deps = [ ":base_jni", - "//webrtc:webrtc_common", - "//webrtc/api:libjingle_peerconnection_api", - "//webrtc/api:video_frame_api", - "//webrtc/api/video_codecs:video_codecs_api", - "//webrtc/base:rtc_base", - "//webrtc/base:rtc_base_approved", - "//webrtc/base:rtc_task_queue", - "//webrtc/base:sequenced_task_checker", - "//webrtc/base:weak_ptr", - "//webrtc/common_video:common_video", - "//webrtc/media:rtc_audio_video", - "//webrtc/media:rtc_media_base", - "//webrtc/modules/utility:utility", - "//webrtc/modules/video_coding:video_coding_utility", - "//webrtc/system_wrappers:system_wrappers", + "../..:webrtc_common", + "../../api:libjingle_peerconnection_api", + "../../api:video_frame_api", + "../../api/video_codecs:video_codecs_api", + "../../base:rtc_base", + "../../base:rtc_base_approved", + "../../base:rtc_task_queue", + "../../base:sequenced_task_checker", + "../../base:weak_ptr", + "../../common_video:common_video", + "../../media:rtc_audio_video", + "../../media:rtc_media_base", + "../../modules/utility:utility", + "../../modules/video_coding:video_coding_utility", + "../../system_wrappers:system_wrappers", ] if (rtc_build_libyuv) { @@ -180,10 +180,10 @@ rtc_static_library("media_jni") { deps = [ ":base_jni", - "//webrtc/call:call_interfaces", - "//webrtc/logging:rtc_event_log_api", - "//webrtc/media:rtc_audio_video", - "//webrtc/modules/audio_processing:audio_processing", + "../../call:call_interfaces", + "../../logging:rtc_event_log_api", + "../../media:rtc_audio_video", + "../../modules/audio_processing:audio_processing", ] if (is_clang) { @@ -237,14 +237,14 @@ rtc_static_library("peerconnection_jni") { deps = [ ":base_jni", "../..:webrtc_common", - "//webrtc/base:rtc_base", - "//webrtc/base:rtc_base_approved", - "//webrtc/base:rtc_task_queue", - "//webrtc/media:rtc_data", - "//webrtc/media:rtc_media_base", - "//webrtc/modules/utility:utility", - "//webrtc/pc:peerconnection", - "//webrtc/system_wrappers:system_wrappers", + "../../base:rtc_base", + "../../base:rtc_base_approved", + "../../base:rtc_task_queue", + "../../media:rtc_data", + "../../media:rtc_media_base", + "../../modules/utility:utility", + "../../pc:peerconnection", + "../../system_wrappers:system_wrappers", ] } @@ -255,7 +255,7 @@ rtc_static_library("libjingle_peerconnection_jni") { ":media_jni", ":peerconnection_jni", ":video_jni", - "//webrtc/pc:create_pc_factory", + "../../pc:create_pc_factory", ] } @@ -269,10 +269,10 @@ rtc_static_library("libjingle_peerconnection_metrics_default_jni") { deps = [ ":base_jni", ":peerconnection_jni", - "//webrtc/pc:peerconnection", - "//webrtc/system_wrappers", - "//webrtc/system_wrappers:field_trial_default", - "//webrtc/system_wrappers:metrics_default", + "../../pc:peerconnection", + "../../system_wrappers", + "../../system_wrappers:field_trial_default", + "../../system_wrappers:metrics_default", ] } @@ -294,9 +294,9 @@ rtc_shared_library("libjingle_peerconnection_datachannelonly_so") { ":null_media_jni", ":null_video_jni", ":peerconnection_jni", - "//webrtc/base:rtc_base", - "//webrtc/base:rtc_base_approved", - "//webrtc/pc:peerconnection", + "../../base:rtc_base", + "../../base:rtc_base_approved", + "../../pc:peerconnection", ] output_extension = "so" } @@ -312,8 +312,8 @@ rtc_shared_library("libjingle_peerconnection_so") { deps = [ ":libjingle_peerconnection_jni", ":libjingle_peerconnection_metrics_default_jni", - "//webrtc/base:rtc_base", - "//webrtc/pc:libjingle_peerconnection", + "../../base:rtc_base", + "../../pc:libjingle_peerconnection", ] output_extension = "so" } @@ -326,8 +326,8 @@ dist_jar("libwebrtc") { deps = [ ":libjingle_peerconnection_java", ":libjingle_peerconnection_metrics_default_java", - "//webrtc/modules/audio_device:audio_device_java", - "//webrtc/rtc_base:base_java", + "../../modules/audio_device:audio_device_java", + "../../rtc_base:base_java", ] } @@ -415,8 +415,8 @@ android_library("libjingle_peerconnection_java") { ] deps = [ - "//webrtc/modules/audio_device:audio_device_java", - "//webrtc/rtc_base:base_java", + "../../modules/audio_device:audio_device_java", + "../../rtc_base:base_java", ] } @@ -424,7 +424,7 @@ android_library("libjingle_peerconnection_metrics_default_java") { java_files = [ "api/org/webrtc/Metrics.java" ] deps = [ - "//webrtc/rtc_base:base_java", + "../../rtc_base:base_java", ] } @@ -454,20 +454,20 @@ if (rtc_include_tests) { ] data = [ - "//webrtc/sdk/android/instrumentationtests/src/org/webrtc/capturetestvideo.y4m", + "../../sdk/android/instrumentationtests/src/org/webrtc/capturetestvideo.y4m", ] deps = [ + "../../rtc_base:base_java", + "../../sdk/android:libjingle_peerconnection_java", + "../../sdk/android:libjingle_peerconnection_metrics_default_java", "//base:base_java", "//base:base_java_test_support", "//third_party/android_support_test_runner:rules_java", "//third_party/android_support_test_runner:runner_java", "//third_party/junit", - "//webrtc/rtc_base:base_java", - "//webrtc/sdk/android:libjingle_peerconnection_java", - "//webrtc/sdk/android:libjingle_peerconnection_metrics_default_java", ] - shared_libraries = [ "//webrtc/sdk/android:libjingle_peerconnection_so" ] + shared_libraries = [ "../../sdk/android:libjingle_peerconnection_so" ] } } diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn index f54a62252d..2719db451d 100644 --- a/webrtc/test/BUILD.gn +++ b/webrtc/test/BUILD.gn @@ -249,13 +249,13 @@ if (!build_with_chromium) { } test_support_unittests_resources = [ - "//resources/foreman_cif_short.yuv", - "//resources/video_coding/frame-ethernet-ii.pcap", - "//resources/video_coding/frame-loopback.pcap", - "//resources/video_coding/pltype103.rtp", - "//resources/video_coding/pltype103_header_only.rtp", - "//resources/video_coding/ssrcs-2.pcap", - "//resources/video_coding/ssrcs-3.pcap", + "../../resources/foreman_cif_short.yuv", + "../../resources/video_coding/frame-ethernet-ii.pcap", + "../../resources/video_coding/frame-loopback.pcap", + "../../resources/video_coding/pltype103.rtp", + "../../resources/video_coding/pltype103_header_only.rtp", + "../../resources/video_coding/ssrcs-2.pcap", + "../../resources/video_coding/ssrcs-3.pcap", ] if (is_ios) { @@ -606,8 +606,8 @@ if (!build_with_chromium && is_android) { "android/org/webrtc/native_test/RTCNativeUnitTestActivity.java", ] deps = [ + "../rtc_base:base_java", "//testing/android/native_test:native_test_java", - "//webrtc/rtc_base:base_java", ] } } diff --git a/webrtc/video/BUILD.gn b/webrtc/video/BUILD.gn index 5faf28048e..e6f63f25eb 100644 --- a/webrtc/video/BUILD.gn +++ b/webrtc/video/BUILD.gn @@ -107,11 +107,11 @@ if (rtc_include_tests) { "../modules/video_coding:webrtc_vp9", "../system_wrappers", "../test:test_common", + "../test:test_renderer", "../test:test_support", + "../test:video_test_common", "../voice_engine", "//testing/gtest", - "//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). @@ -126,7 +126,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 = [ "full_stack_tests.cc", @@ -135,9 +135,9 @@ if (rtc_include_tests) { ":video_quality_test", "../modules/pacing:pacing", "../test:field_trial", + "../test:test_common", "../test:test_support", "//testing/gtest", - "//webrtc/test:test_common", ] if (!build_with_chromium && is_clang) { # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). @@ -233,7 +233,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:video_engine_tests" ] + visibility = [ "..:video_engine_tests" ] } defines = [] sources = [ diff --git a/webrtc/voice_engine/BUILD.gn b/webrtc/voice_engine/BUILD.gn index e16b1762a7..e98a89b223 100644 --- a/webrtc/voice_engine/BUILD.gn +++ b/webrtc/voice_engine/BUILD.gn @@ -184,23 +184,23 @@ if (rtc_include_tests) { ":voice_engine", "../base:rtc_base_approved", "../base:rtc_base_tests_utils", + "../common_audio", "../modules:module_api", + "../modules/audio_coding", + "../modules/audio_conference_mixer", + "../modules/audio_device", + "../modules/audio_processing", + "../modules/media_file", + "../modules/rtp_rtcp", + "../modules/utility", + "../modules/video_capture:video_capture", + "../system_wrappers", "../test:test_common", + "../test:test_main", + "../test:video_test_common", "//testing/gmock", "//testing/gtest", "//third_party/gflags", - "//webrtc/common_audio", - "//webrtc/modules/audio_coding", - "//webrtc/modules/audio_conference_mixer", - "//webrtc/modules/audio_device", - "//webrtc/modules/audio_processing", - "//webrtc/modules/media_file", - "//webrtc/modules/rtp_rtcp", - "//webrtc/modules/utility", - "//webrtc/modules/video_capture:video_capture", - "//webrtc/system_wrappers", - "//webrtc/test:test_main", - "//webrtc/test:video_test_common", ] if (is_android) { @@ -221,8 +221,8 @@ if (rtc_include_tests) { ] data = [ - "//resources/utility/encapsulated_pcm16b_8khz.wav", - "//resources/utility/encapsulated_pcmu_8khz.wav", + "../../resources/utility/encapsulated_pcm16b_8khz.wav", + "../../resources/utility/encapsulated_pcmu_8khz.wav", ] if (is_win) { @@ -248,20 +248,20 @@ if (rtc_include_tests) { ":voice_engine", "..:webrtc_common", "../base:rtc_base_approved", + "../logging:rtc_event_log_api", "../modules:module_api", "../modules/audio_device:audio_device", "../modules/audio_processing:audio_processing", "../modules/rtp_rtcp:rtp_rtcp", + "../modules/video_capture", + "../system_wrappers", + "../system_wrappers/:system_wrappers_default", + "../test/:test_common", + "../test/:test_support", + "../test/:video_test_common", "//testing/gmock", "//testing/gtest", "//third_party/gflags", - "//webrtc/logging:rtc_event_log_api", - "//webrtc/modules/video_capture", - "//webrtc/system_wrappers", - "//webrtc/system_wrappers/:system_wrappers_default", - "//webrtc/test/:test_common", - "//webrtc/test/:test_support", - "//webrtc/test/:video_test_common", ] sources = [