| OLD | NEW |
| 1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license |
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source |
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found |
| 6 # in the file PATENTS. All contributing project authors may | 6 # in the file PATENTS. All contributing project authors may |
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. |
| 8 | 8 |
| 9 import("../webrtc.gni") | 9 import("../webrtc.gni") |
| 10 if (is_android) { | 10 if (is_android) { |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 | 50 |
| 51 if (is_android) { | 51 if (is_android) { |
| 52 android_apk("AppRTCMobile") { | 52 android_apk("AppRTCMobile") { |
| 53 testonly = true | 53 testonly = true |
| 54 apk_name = "AppRTCMobile" | 54 apk_name = "AppRTCMobile" |
| 55 android_manifest = "androidapp/AndroidManifest.xml" | 55 android_manifest = "androidapp/AndroidManifest.xml" |
| 56 | 56 |
| 57 deps = [ | 57 deps = [ |
| 58 ":AppRTCMobile_javalib", | 58 ":AppRTCMobile_javalib", |
| 59 ":AppRTCMobile_resources", | 59 ":AppRTCMobile_resources", |
| 60 "../rtc_base:base_java", |
| 60 "//base:base_java", | 61 "//base:base_java", |
| 61 "//webrtc/rtc_base:base_java", | |
| 62 ] | 62 ] |
| 63 | 63 |
| 64 shared_libraries = [ "//webrtc/sdk/android:libjingle_peerconnection_so" ] | 64 shared_libraries = [ "../sdk/android:libjingle_peerconnection_so" ] |
| 65 } | 65 } |
| 66 | 66 |
| 67 android_library("AppRTCMobile_javalib") { | 67 android_library("AppRTCMobile_javalib") { |
| 68 testonly = true | 68 testonly = true |
| 69 android_manifest = "androidapp/AndroidManifest.xml" | 69 android_manifest = "androidapp/AndroidManifest.xml" |
| 70 | 70 |
| 71 java_files = [ | 71 java_files = [ |
| 72 "androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java", | 72 "androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java", |
| 73 "androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java", | 73 "androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java", |
| 74 "androidapp/src/org/appspot/apprtc/AppRTCClient.java", | 74 "androidapp/src/org/appspot/apprtc/AppRTCClient.java", |
| (...skipping 12 matching lines...) Expand all Loading... |
| 87 "androidapp/src/org/appspot/apprtc/TCPChannelClient.java", | 87 "androidapp/src/org/appspot/apprtc/TCPChannelClient.java", |
| 88 "androidapp/src/org/appspot/apprtc/UnhandledExceptionHandler.java", | 88 "androidapp/src/org/appspot/apprtc/UnhandledExceptionHandler.java", |
| 89 "androidapp/src/org/appspot/apprtc/WebSocketChannelClient.java", | 89 "androidapp/src/org/appspot/apprtc/WebSocketChannelClient.java", |
| 90 "androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java", | 90 "androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java", |
| 91 "androidapp/src/org/appspot/apprtc/util/AppRTCUtils.java", | 91 "androidapp/src/org/appspot/apprtc/util/AppRTCUtils.java", |
| 92 "androidapp/src/org/appspot/apprtc/util/AsyncHttpURLConnection.java", | 92 "androidapp/src/org/appspot/apprtc/util/AsyncHttpURLConnection.java", |
| 93 ] | 93 ] |
| 94 | 94 |
| 95 deps = [ | 95 deps = [ |
| 96 ":AppRTCMobile_resources", | 96 ":AppRTCMobile_resources", |
| 97 "//webrtc/examples/androidapp/third_party/autobanh:autobanh_java", | 97 "../modules/audio_device:audio_device_java", |
| 98 "//webrtc/modules/audio_device:audio_device_java", | 98 "../rtc_base:base_java", |
| 99 "//webrtc/rtc_base:base_java", | 99 "../sdk/android:libjingle_peerconnection_java", |
| 100 "//webrtc/sdk/android:libjingle_peerconnection_java", | 100 "../sdk/android:libjingle_peerconnection_metrics_default_java", |
| 101 "//webrtc/sdk/android:libjingle_peerconnection_metrics_default_java", | 101 "androidapp/third_party/autobanh:autobanh_java", |
| 102 ] | 102 ] |
| 103 } | 103 } |
| 104 | 104 |
| 105 android_resources("AppRTCMobile_resources") { | 105 android_resources("AppRTCMobile_resources") { |
| 106 testonly = true | 106 testonly = true |
| 107 resource_dirs = [ "androidapp/res" ] | 107 resource_dirs = [ "androidapp/res" ] |
| 108 custom_package = "org.appspot.apprtc" | 108 custom_package = "org.appspot.apprtc" |
| 109 } | 109 } |
| 110 | 110 |
| 111 instrumentation_test_apk("AppRTCMobileTest") { | 111 instrumentation_test_apk("AppRTCMobileTest") { |
| 112 apk_name = "AppRTCMobileTest" | 112 apk_name = "AppRTCMobileTest" |
| 113 android_manifest = "androidtests/AndroidManifest.xml" | 113 android_manifest = "androidtests/AndroidManifest.xml" |
| 114 | 114 |
| 115 java_files = [ "androidtests/src/org/appspot/apprtc/test/PeerConnectionClien
tTest.java" ] | 115 java_files = [ "androidtests/src/org/appspot/apprtc/test/PeerConnectionClien
tTest.java" ] |
| 116 | 116 |
| 117 apk_under_test = ":AppRTCMobile" | 117 apk_under_test = ":AppRTCMobile" |
| 118 | 118 |
| 119 deps = [ | 119 deps = [ |
| 120 ":AppRTCMobile_javalib", | 120 ":AppRTCMobile_javalib", |
| 121 "../sdk/android:libjingle_peerconnection_java", |
| 121 "//base:base_java_test_support", | 122 "//base:base_java_test_support", |
| 122 "//third_party/android_support_test_runner:runner_java", | 123 "//third_party/android_support_test_runner:runner_java", |
| 123 "//third_party/junit", | 124 "//third_party/junit", |
| 124 "//webrtc/sdk/android:libjingle_peerconnection_java", | |
| 125 ] | 125 ] |
| 126 } | 126 } |
| 127 | 127 |
| 128 instrumentation_test_apk("AppRTCMobileTestStubbedVideoIO") { | 128 instrumentation_test_apk("AppRTCMobileTestStubbedVideoIO") { |
| 129 apk_name = "AppRTCMobileTestStubbedVideoIO" | 129 apk_name = "AppRTCMobileTestStubbedVideoIO" |
| 130 android_manifest = "androidtests/AndroidManifest.xml" | 130 android_manifest = "androidtests/AndroidManifest.xml" |
| 131 | 131 |
| 132 java_files = [ "androidtests/src/org/appspot/apprtc/test/CallActivityStubbed
InputOutputTest.java" ] | 132 java_files = [ "androidtests/src/org/appspot/apprtc/test/CallActivityStubbed
InputOutputTest.java" ] |
| 133 | 133 |
| 134 apk_under_test = ":AppRTCMobile" | 134 apk_under_test = ":AppRTCMobile" |
| 135 | 135 |
| 136 deps = [ | 136 deps = [ |
| 137 ":AppRTCMobile_javalib", | 137 ":AppRTCMobile_javalib", |
| 138 "../sdk/android:libjingle_peerconnection_java", |
| 138 "//third_party/android_support_test_runner:rules_java", | 139 "//third_party/android_support_test_runner:rules_java", |
| 139 "//third_party/android_support_test_runner:runner_java", | 140 "//third_party/android_support_test_runner:runner_java", |
| 140 "//third_party/espresso:espresso_all_java", | 141 "//third_party/espresso:espresso_all_java", |
| 141 "//third_party/hamcrest:hamcrest_java", | 142 "//third_party/hamcrest:hamcrest_java", |
| 142 "//third_party/junit", | 143 "//third_party/junit", |
| 143 "//webrtc/sdk/android:libjingle_peerconnection_java", | |
| 144 ] | 144 ] |
| 145 | 145 |
| 146 data = [ | 146 data = [ |
| 147 "//resources/reference_video_640x360_30fps.y4m", | 147 "../../resources/reference_video_640x360_30fps.y4m", |
| 148 ] | 148 ] |
| 149 } | 149 } |
| 150 } | 150 } |
| 151 | 151 |
| 152 if (is_ios || (is_mac && target_cpu != "x86")) { | 152 if (is_ios || (is_mac && target_cpu != "x86")) { |
| 153 config("apprtc_common_config") { | 153 config("apprtc_common_config") { |
| 154 include_dirs = [ "objc/AppRTCMobile/common" ] | 154 include_dirs = [ "objc/AppRTCMobile/common" ] |
| 155 } | 155 } |
| 156 | 156 |
| 157 rtc_static_library("apprtc_common") { | 157 rtc_static_library("apprtc_common") { |
| 158 testonly = true | 158 testonly = true |
| 159 sources = [ | 159 sources = [ |
| 160 "objc/AppRTCMobile/common/ARDUtilities.h", | 160 "objc/AppRTCMobile/common/ARDUtilities.h", |
| 161 "objc/AppRTCMobile/common/ARDUtilities.m", | 161 "objc/AppRTCMobile/common/ARDUtilities.m", |
| 162 ] | 162 ] |
| 163 public_configs = [ ":apprtc_common_config" ] | 163 public_configs = [ ":apprtc_common_config" ] |
| 164 | 164 |
| 165 deps = [ | 165 deps = [ |
| 166 "//webrtc/system_wrappers:field_trial_default", | 166 "../system_wrappers:field_trial_default", |
| 167 "//webrtc/system_wrappers:metrics_default", | 167 "../system_wrappers:metrics_default", |
| 168 ] | 168 ] |
| 169 if (is_ios) { | 169 if (is_ios) { |
| 170 deps += [ ":AppRTCMobile_ios_frameworks" ] | 170 deps += [ ":AppRTCMobile_ios_frameworks" ] |
| 171 } else { | 171 } else { |
| 172 deps += [ "//webrtc/sdk:objc_common" ] | 172 deps += [ "../sdk:objc_common" ] |
| 173 } | 173 } |
| 174 } | 174 } |
| 175 | 175 |
| 176 config("apprtc_signaling_config") { | 176 config("apprtc_signaling_config") { |
| 177 include_dirs = [ "objc/AppRTCMobile" ] | 177 include_dirs = [ "objc/AppRTCMobile" ] |
| 178 | 178 |
| 179 # GN orders flags on a target before flags from configs. The default config | 179 # GN orders flags on a target before flags from configs. The default config |
| 180 # adds these flags so to cancel them out they need to come from a config and | 180 # adds these flags so to cancel them out they need to come from a config and |
| 181 # cannot be on the target directly. | 181 # cannot be on the target directly. |
| 182 cflags = [ | 182 cflags = [ |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 ] | 232 ] |
| 233 public_configs = [ ":apprtc_signaling_config" ] | 233 public_configs = [ ":apprtc_signaling_config" ] |
| 234 deps = [ | 234 deps = [ |
| 235 ":apprtc_common", | 235 ":apprtc_common", |
| 236 ":socketrocket", | 236 ":socketrocket", |
| 237 ] | 237 ] |
| 238 if (is_ios) { | 238 if (is_ios) { |
| 239 deps += [ ":AppRTCMobile_ios_frameworks" ] | 239 deps += [ ":AppRTCMobile_ios_frameworks" ] |
| 240 } else { | 240 } else { |
| 241 public_deps = [ | 241 public_deps = [ |
| 242 "//webrtc/sdk:objc_peerconnection", | 242 "../sdk:objc_peerconnection", |
| 243 ] | 243 ] |
| 244 } | 244 } |
| 245 libs = [ "QuartzCore.framework" ] | 245 libs = [ "QuartzCore.framework" ] |
| 246 } | 246 } |
| 247 | 247 |
| 248 if (is_ios) { | 248 if (is_ios) { |
| 249 rtc_static_library("AppRTCMobile_lib") { | 249 rtc_static_library("AppRTCMobile_lib") { |
| 250 testonly = true | 250 testonly = true |
| 251 sources = [ | 251 sources = [ |
| 252 "objc/AppRTCMobile/ios/ARDAppDelegate.m", | 252 "objc/AppRTCMobile/ios/ARDAppDelegate.m", |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 ":AppRTCMobile_lib", | 291 ":AppRTCMobile_lib", |
| 292 ] | 292 ] |
| 293 | 293 |
| 294 if (target_cpu == "x86") { | 294 if (target_cpu == "x86") { |
| 295 deps += [ "//testing/iossim:iossim" ] | 295 deps += [ "//testing/iossim:iossim" ] |
| 296 } | 296 } |
| 297 } | 297 } |
| 298 | 298 |
| 299 bundle_data("AppRTCMobile_ios_frameworks") { | 299 bundle_data("AppRTCMobile_ios_frameworks") { |
| 300 public_deps = [ | 300 public_deps = [ |
| 301 "//webrtc/sdk:objc_framework+link", | 301 "../sdk:objc_framework+link", |
| 302 ] | 302 ] |
| 303 sources = [ | 303 sources = [ |
| 304 "$root_out_dir/WebRTC.framework", | 304 "$root_out_dir/WebRTC.framework", |
| 305 ] | 305 ] |
| 306 outputs = [ | 306 outputs = [ |
| 307 "{{bundle_resources_dir}}/Frameworks/{{source_file_part}}", | 307 "{{bundle_resources_dir}}/Frameworks/{{source_file_part}}", |
| 308 ] | 308 ] |
| 309 } | 309 } |
| 310 | 310 |
| 311 bundle_data("AppRTCMobile_ios_bundle_data") { | 311 bundle_data("AppRTCMobile_ios_bundle_data") { |
| (...skipping 23 matching lines...) Expand all Loading... |
| 335 | 335 |
| 336 if (is_mac) { | 336 if (is_mac) { |
| 337 rtc_static_library("AppRTCMobile_lib") { | 337 rtc_static_library("AppRTCMobile_lib") { |
| 338 testonly = true | 338 testonly = true |
| 339 sources = [ | 339 sources = [ |
| 340 "objc/AppRTCMobile/mac/APPRTCAppDelegate.h", | 340 "objc/AppRTCMobile/mac/APPRTCAppDelegate.h", |
| 341 "objc/AppRTCMobile/mac/APPRTCAppDelegate.m", | 341 "objc/AppRTCMobile/mac/APPRTCAppDelegate.m", |
| 342 "objc/AppRTCMobile/mac/APPRTCViewController.h", | 342 "objc/AppRTCMobile/mac/APPRTCViewController.h", |
| 343 "objc/AppRTCMobile/mac/APPRTCViewController.m", | 343 "objc/AppRTCMobile/mac/APPRTCViewController.m", |
| 344 ] | 344 ] |
| 345 configs += [ "//webrtc:common_objc" ] | 345 configs += [ "..:common_objc" ] |
| 346 deps = [ | 346 deps = [ |
| 347 ":apprtc_common", | 347 ":apprtc_common", |
| 348 ":apprtc_signaling", | 348 ":apprtc_signaling", |
| 349 "//webrtc/sdk:objc_ui", | 349 "../sdk:objc_ui", |
| 350 ] | 350 ] |
| 351 } | 351 } |
| 352 | 352 |
| 353 mac_app_bundle("AppRTCMobile") { | 353 mac_app_bundle("AppRTCMobile") { |
| 354 testonly = true | 354 testonly = true |
| 355 output_name = "AppRTCMobile" | 355 output_name = "AppRTCMobile" |
| 356 | 356 |
| 357 sources = [ | 357 sources = [ |
| 358 "objc/AppRTCMobile/mac/main.m", | 358 "objc/AppRTCMobile/mac/main.m", |
| 359 ] | 359 ] |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 "objc/AppRTCMobile", | 415 "objc/AppRTCMobile", |
| 416 "objc/AppRTCMobile/ios", | 416 "objc/AppRTCMobile/ios", |
| 417 ] | 417 ] |
| 418 testonly = true | 418 testonly = true |
| 419 sources = [ | 419 sources = [ |
| 420 "objc/AppRTCMobile/tests/ARDAppClient_xctest.mm", | 420 "objc/AppRTCMobile/tests/ARDAppClient_xctest.mm", |
| 421 "objc/AppRTCMobile/tests/ARDSDPUtils_xctest.mm", | 421 "objc/AppRTCMobile/tests/ARDSDPUtils_xctest.mm", |
| 422 "objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm", | 422 "objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm", |
| 423 ] | 423 ] |
| 424 deps = [ | 424 deps = [ |
| 425 "//webrtc/base:rtc_base", | 425 "../rtc_base:rtc_base", |
| 426 ] | 426 ] |
| 427 public_deps = [ | 427 public_deps = [ |
| 428 ":AppRTCMobile_ios_frameworks", | 428 ":AppRTCMobile_ios_frameworks", |
| 429 ":AppRTCMobile_lib", | 429 ":AppRTCMobile_lib", |
| 430 "//build/config/ios:xctest", | 430 "//build/config/ios:xctest", |
| 431 "//third_party/ocmock", | 431 "//third_party/ocmock", |
| 432 ] | 432 ] |
| 433 } | 433 } |
| 434 | 434 |
| 435 rtc_ios_xctest_test("apprtcmobile_tests") { | 435 rtc_ios_xctest_test("apprtcmobile_tests") { |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 494 deps = [] | 494 deps = [] |
| 495 if (is_win) { | 495 if (is_win) { |
| 496 sources += [ | 496 sources += [ |
| 497 "peerconnection/client/flagdefs.h", | 497 "peerconnection/client/flagdefs.h", |
| 498 "peerconnection/client/main.cc", | 498 "peerconnection/client/main.cc", |
| 499 "peerconnection/client/main_wnd.cc", | 499 "peerconnection/client/main_wnd.cc", |
| 500 "peerconnection/client/main_wnd.h", | 500 "peerconnection/client/main_wnd.h", |
| 501 ] | 501 ] |
| 502 cflags = [ "/wd4245" ] | 502 cflags = [ "/wd4245" ] |
| 503 configs += [ "//build/config/win:windowed" ] | 503 configs += [ "//build/config/win:windowed" ] |
| 504 deps += [ "//webrtc/media:rtc_media_base" ] | 504 deps += [ "../media:rtc_media_base" ] |
| 505 } | 505 } |
| 506 if (is_linux) { | 506 if (is_linux) { |
| 507 sources += [ | 507 sources += [ |
| 508 "peerconnection/client/linux/main.cc", | 508 "peerconnection/client/linux/main.cc", |
| 509 "peerconnection/client/linux/main_wnd.cc", | 509 "peerconnection/client/linux/main_wnd.cc", |
| 510 "peerconnection/client/linux/main_wnd.h", | 510 "peerconnection/client/linux/main_wnd.h", |
| 511 ] | 511 ] |
| 512 cflags = [ "-Wno-deprecated-declarations" ] | 512 cflags = [ "-Wno-deprecated-declarations" ] |
| 513 libs = [ | 513 libs = [ |
| 514 "X11", | 514 "X11", |
| 515 "Xcomposite", | 515 "Xcomposite", |
| 516 "Xext", | 516 "Xext", |
| 517 "Xrender", | 517 "Xrender", |
| 518 ] | 518 ] |
| 519 deps += [ "//build/config/linux/gtk" ] | 519 deps += [ "//build/config/linux/gtk" ] |
| 520 } | 520 } |
| 521 configs += [ ":peerconnection_client_warnings_config" ] | 521 configs += [ ":peerconnection_client_warnings_config" ] |
| 522 | 522 |
| 523 deps += [ | 523 deps += [ |
| 524 "../api:libjingle_peerconnection_test_api", |
| 525 "../api:video_frame_api", |
| 526 "../base:rtc_base", |
| 527 "../base:rtc_base_approved", |
| 528 "../base:rtc_json", |
| 529 "../media:rtc_media", |
| 530 "../modules/video_capture:video_capture_module", |
| 531 "../pc:libjingle_peerconnection", |
| 532 "../system_wrappers:field_trial_default", |
| 533 "../system_wrappers:metrics_default", |
| 524 "//third_party/libyuv", | 534 "//third_party/libyuv", |
| 525 "//webrtc/api:libjingle_peerconnection_test_api", | |
| 526 "//webrtc/api:video_frame_api", | |
| 527 "//webrtc/base:rtc_base", | |
| 528 "//webrtc/base:rtc_base_approved", | |
| 529 "//webrtc/base:rtc_json", | |
| 530 "//webrtc/media:rtc_media", | |
| 531 "//webrtc/modules/video_capture:video_capture_module", | |
| 532 "//webrtc/pc:libjingle_peerconnection", | |
| 533 "//webrtc/system_wrappers:field_trial_default", | |
| 534 "//webrtc/system_wrappers:metrics_default", | |
| 535 ] | 535 ] |
| 536 } | 536 } |
| 537 | 537 |
| 538 rtc_executable("peerconnection_server") { | 538 rtc_executable("peerconnection_server") { |
| 539 testonly = true | 539 testonly = true |
| 540 sources = [ | 540 sources = [ |
| 541 "peerconnection/server/data_socket.cc", | 541 "peerconnection/server/data_socket.cc", |
| 542 "peerconnection/server/data_socket.h", | 542 "peerconnection/server/data_socket.h", |
| 543 "peerconnection/server/main.cc", | 543 "peerconnection/server/main.cc", |
| 544 "peerconnection/server/peer_channel.cc", | 544 "peerconnection/server/peer_channel.cc", |
| 545 "peerconnection/server/peer_channel.h", | 545 "peerconnection/server/peer_channel.h", |
| 546 "peerconnection/server/utils.cc", | 546 "peerconnection/server/utils.cc", |
| 547 "peerconnection/server/utils.h", | 547 "peerconnection/server/utils.h", |
| 548 ] | 548 ] |
| 549 deps = [ | 549 deps = [ |
| 550 "..:webrtc_common", |
| 551 "../base:rtc_base_approved", |
| 552 "../rtc_tools:command_line_parser", |
| 550 "//webrtc:webrtc_common", | 553 "//webrtc:webrtc_common", |
| 551 "//webrtc/base:rtc_base_approved", | 554 "//webrtc/base:rtc_base_approved", |
| 552 "//webrtc/rtc_tools:command_line_parser", | 555 "//webrtc/rtc_tools:command_line_parser", |
| 553 ] | 556 ] |
| 554 if (!build_with_chromium && is_clang) { | 557 if (!build_with_chromium && is_clang) { |
| 555 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 558 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 556 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 559 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 557 } | 560 } |
| 558 } | 561 } |
| 559 rtc_executable("relayserver") { | 562 rtc_executable("relayserver") { |
| 560 testonly = true | 563 testonly = true |
| 561 sources = [ | 564 sources = [ |
| 562 "relayserver/relayserver_main.cc", | 565 "relayserver/relayserver_main.cc", |
| 563 ] | 566 ] |
| 564 deps = [ | 567 deps = [ |
| 565 "../base:rtc_base", | 568 "../base:rtc_base", |
| 566 "//webrtc/base:rtc_base_approved", | 569 "../base:rtc_base_approved", |
| 567 "//webrtc/p2p:rtc_p2p", | 570 "../p2p:rtc_p2p", |
| 568 "//webrtc/pc:rtc_pc", | 571 "../pc:rtc_pc", |
| 569 "//webrtc/system_wrappers:field_trial_default", | 572 "../system_wrappers:field_trial_default", |
| 570 "//webrtc/system_wrappers:metrics_default", | 573 "../system_wrappers:metrics_default", |
| 571 ] | 574 ] |
| 572 if (!build_with_chromium && is_clang) { | 575 if (!build_with_chromium && is_clang) { |
| 573 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 576 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 574 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 577 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 575 } | 578 } |
| 576 } | 579 } |
| 577 rtc_executable("turnserver") { | 580 rtc_executable("turnserver") { |
| 578 testonly = true | 581 testonly = true |
| 579 sources = [ | 582 sources = [ |
| 580 "turnserver/turnserver_main.cc", | 583 "turnserver/turnserver_main.cc", |
| 581 ] | 584 ] |
| 582 deps = [ | 585 deps = [ |
| 583 "../base:rtc_base", | 586 "../base:rtc_base", |
| 584 "//webrtc/base:rtc_base_approved", | 587 "../base:rtc_base_approved", |
| 585 "//webrtc/p2p:rtc_p2p", | 588 "../p2p:rtc_p2p", |
| 586 "//webrtc/pc:rtc_pc", | 589 "../pc:rtc_pc", |
| 587 "//webrtc/system_wrappers:field_trial_default", | 590 "../system_wrappers:field_trial_default", |
| 588 "//webrtc/system_wrappers:metrics_default", | 591 "../system_wrappers:metrics_default", |
| 589 ] | 592 ] |
| 590 if (!build_with_chromium && is_clang) { | 593 if (!build_with_chromium && is_clang) { |
| 591 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 594 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 592 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 595 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 593 } | 596 } |
| 594 } | 597 } |
| 595 rtc_executable("stunserver") { | 598 rtc_executable("stunserver") { |
| 596 testonly = true | 599 testonly = true |
| 597 sources = [ | 600 sources = [ |
| 598 "stunserver/stunserver_main.cc", | 601 "stunserver/stunserver_main.cc", |
| 599 ] | 602 ] |
| 600 deps = [ | 603 deps = [ |
| 601 "../base:rtc_base", | 604 "../base:rtc_base", |
| 602 "//webrtc/base:rtc_base_approved", | 605 "../base:rtc_base_approved", |
| 603 "//webrtc/p2p:rtc_p2p", | 606 "../p2p:rtc_p2p", |
| 604 "//webrtc/pc:rtc_pc", | 607 "../pc:rtc_pc", |
| 605 "//webrtc/system_wrappers:field_trial_default", | 608 "../system_wrappers:field_trial_default", |
| 606 "//webrtc/system_wrappers:metrics_default", | 609 "../system_wrappers:metrics_default", |
| 607 ] | 610 ] |
| 608 if (!build_with_chromium && is_clang) { | 611 if (!build_with_chromium && is_clang) { |
| 609 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 612 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 610 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 613 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 611 } | 614 } |
| 612 } | 615 } |
| 613 } | 616 } |
| 614 | 617 |
| 615 if (is_win) { | 618 if (is_win) { |
| 616 rtc_shared_library("webrtc_unity_plugin") { | 619 rtc_shared_library("webrtc_unity_plugin") { |
| 617 testonly = true | 620 testonly = true |
| 618 sources = [ | 621 sources = [ |
| 619 "unityplugin/simple_peer_connection.cc", | 622 "unityplugin/simple_peer_connection.cc", |
| 620 "unityplugin/simple_peer_connection.h", | 623 "unityplugin/simple_peer_connection.h", |
| 621 "unityplugin/unity_plugin_apis.cc", | 624 "unityplugin/unity_plugin_apis.cc", |
| 622 "unityplugin/unity_plugin_apis.h", | 625 "unityplugin/unity_plugin_apis.h", |
| 623 ] | 626 ] |
| 624 if (!build_with_chromium && is_clang) { | 627 if (!build_with_chromium && is_clang) { |
| 625 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 628 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 626 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 629 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 627 } | 630 } |
| 628 cflags = [ "/wd4245" ] | 631 cflags = [ "/wd4245" ] |
| 629 configs += [ | 632 configs += [ |
| 630 "//build/config/win:windowed", | 633 "//build/config/win:windowed", |
| 631 ":peerconnection_client_warnings_config", | 634 ":peerconnection_client_warnings_config", |
| 632 ] | 635 ] |
| 633 deps = [ | 636 deps = [ |
| 634 "//webrtc/api:libjingle_peerconnection_test_api", | 637 "../api:libjingle_peerconnection_test_api", |
| 635 "//webrtc/api:video_frame_api", | 638 "../api:video_frame_api", |
| 636 "//webrtc/base:rtc_base", | 639 "../base:rtc_base", |
| 637 "//webrtc/base:rtc_base_approved", | 640 "../base:rtc_base_approved", |
| 638 "//webrtc/base:rtc_json", | 641 "../base:rtc_json", |
| 639 "//webrtc/media:rtc_media", | 642 "../media:rtc_media", |
| 640 "//webrtc/media:rtc_media_base", | 643 "../media:rtc_media_base", |
| 641 "//webrtc/modules/video_capture:video_capture_module", | 644 "../modules/video_capture:video_capture_module", |
| 642 "//webrtc/pc:libjingle_peerconnection", | 645 "../pc:libjingle_peerconnection", |
| 643 "//webrtc/system_wrappers:field_trial_default", | 646 "../system_wrappers:field_trial_default", |
| 644 "//webrtc/system_wrappers:metrics_default", | 647 "../system_wrappers:metrics_default", |
| 645 ] | 648 ] |
| 646 } | 649 } |
| 647 } | 650 } |
| 648 | 651 |
| 649 if (!build_with_chromium) { | 652 if (!build_with_chromium) { |
| 650 # Doesn't build within Chrome on Win. | 653 # Doesn't build within Chrome on Win. |
| 651 rtc_executable("stun_prober") { | 654 rtc_executable("stun_prober") { |
| 652 testonly = true | 655 testonly = true |
| 653 sources = [ | 656 sources = [ |
| 654 "stunprober/main.cc", | 657 "stunprober/main.cc", |
| 655 ] | 658 ] |
| 656 | 659 |
| 657 if (!build_with_chromium && is_clang) { | 660 if (!build_with_chromium && is_clang) { |
| 658 # Suppress warnings from Chrome's Clang plugins. | 661 # Suppress warnings from Chrome's Clang plugins. |
| 659 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 662 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 660 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 663 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 661 } | 664 } |
| 662 | 665 |
| 663 deps = [ | 666 deps = [ |
| 664 "../base:rtc_base", | 667 "../base:rtc_base", |
| 665 "../base:rtc_base_approved", | 668 "../base:rtc_base_approved", |
| 666 "../p2p:libstunprober", | 669 "../p2p:libstunprober", |
| 667 "../p2p:rtc_p2p", | 670 "../p2p:rtc_p2p", |
| 668 "../system_wrappers:field_trial_default", | 671 "../system_wrappers:field_trial_default", |
| 669 ] | 672 ] |
| 670 } | 673 } |
| 671 } | 674 } |
| OLD | NEW |