From da04e06e048f3bb3504268db75f250175cc3bcf9 Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Mon, 23 Jul 2018 10:04:12 +0200 Subject: [PATCH] Fix paths that were trying to go above the root by using too many "../.." This doesn't cause problems because seems like GN just ignores these attempts and confines everything to the root. Bug: None Change-Id: Ief50b6e10f3950b319d0bde547f91dcc7f237cda Reviewed-on: https://webrtc-review.googlesource.com/90041 Commit-Queue: Oleh Prypin Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#24063} --- logging/BUILD.gn | 2 +- modules/audio_device/BUILD.gn | 2 +- sdk/BUILD.gn | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/logging/BUILD.gn b/logging/BUILD.gn index becb51bc47..85215e035c 100644 --- a/logging/BUILD.gn +++ b/logging/BUILD.gn @@ -439,7 +439,7 @@ if (rtc_include_tests) { ] deps = [ ":rtc_event_log_api", - "../../test:test_support", + "../test:test_support", ] } } diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn index ecbd176359..5a7dfed54a 100644 --- a/modules/audio_device/BUILD.gn +++ b/modules/audio_device/BUILD.gn @@ -485,7 +485,7 @@ if (rtc_include_tests) { "android/ensure_initialized.h", ] deps += [ - "../../../base", + "../../base", "../../sdk/android:libjingle_peerconnection_java", ] } diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index c2263f676c..f50223f746 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -856,8 +856,6 @@ if (is_ios || is_mac) { ":videoframebuffer_objc", ":videosource_objc", ":videotoolbox_objc", - "../../system_wrappers:system_wrappers", - "../../system_wrappers:system_wrappers_default", "../api/video:video_frame_i420", "../common_video:common_video", "../media:rtc_media_base", @@ -865,6 +863,8 @@ if (is_ios || is_mac) { "../modules:module_api", "../rtc_base:rtc_base", "../rtc_base:rtc_base_tests_utils", + "../system_wrappers:system_wrappers", + "../system_wrappers:system_wrappers_default", "//third_party/libyuv", ] @@ -966,7 +966,6 @@ if (is_ios || is_mac) { ":videoframebuffer_objc", ":videosource_objc", ":videotoolbox_objc", - "../../system_wrappers:system_wrappers_default", "../api/audio_codecs:audio_codecs_api", "../api/audio_codecs:builtin_audio_decoder_factory", "../api/audio_codecs:builtin_audio_encoder_factory", @@ -977,6 +976,7 @@ if (is_ios || is_mac) { "../modules/audio_processing:audio_processing", "../modules/video_coding:video_codec_interface", "../rtc_base:rtc_base_tests_utils", + "../system_wrappers:system_wrappers_default", "//test:test_support", "//third_party/ocmock", ]