| Index: webrtc/examples/BUILD.gn
|
| diff --git a/webrtc/examples/BUILD.gn b/webrtc/examples/BUILD.gn
|
| index 85813fa22212f2ad6f12ff67b7566a2f908dc5b1..726b5ba0a5da1f38493f8237e7589fe070ab7cf9 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",
|
| ]
|
| }
|
| }
|
|
|