| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 ":peerconnection_server", | 43 ":peerconnection_server", |
| 44 ":relayserver", | 44 ":relayserver", |
| 45 ":stunserver", | 45 ":stunserver", |
| 46 ":turnserver", | 46 ":turnserver", |
| 47 ] | 47 ] |
| 48 } | 48 } |
| 49 } | 49 } |
| 50 | 50 |
| 51 if (is_android) { | 51 if (is_android) { |
| 52 android_apk("AppRTCMobile") { | 52 android_apk("AppRTCMobile") { |
| 53 testonly = true | |
| 54 apk_name = "AppRTCMobile" | 53 apk_name = "AppRTCMobile" |
| 55 android_manifest = "androidapp/AndroidManifest.xml" | 54 android_manifest = "androidapp/AndroidManifest.xml" |
| 56 | 55 |
| 57 deps = [ | 56 deps = [ |
| 58 ":AppRTCMobile_javalib", | 57 ":AppRTCMobile_javalib", |
| 59 ":AppRTCMobile_resources", | 58 ":AppRTCMobile_resources", |
| 60 "//base:base_java", | 59 "//base:base_java", |
| 61 "//webrtc/base:base_java", | 60 "//webrtc/base:base_java", |
| 62 ] | 61 ] |
| 63 | 62 |
| 64 shared_libraries = [ "//webrtc/sdk/android:libjingle_peerconnection_so" ] | 63 shared_libraries = [ "//webrtc/sdk/android:libjingle_peerconnection_so" ] |
| 65 } | 64 } |
| 66 | 65 |
| 67 android_library("AppRTCMobile_javalib") { | 66 android_library("AppRTCMobile_javalib") { |
| 68 testonly = true | |
| 69 android_manifest = "androidapp/AndroidManifest.xml" | 67 android_manifest = "androidapp/AndroidManifest.xml" |
| 70 | 68 |
| 71 java_files = [ | 69 java_files = [ |
| 72 "androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java", | 70 "androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java", |
| 73 "androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java", | 71 "androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java", |
| 74 "androidapp/src/org/appspot/apprtc/AppRTCClient.java", | 72 "androidapp/src/org/appspot/apprtc/AppRTCClient.java", |
| 75 "androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java", | 73 "androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java", |
| 76 "androidapp/src/org/appspot/apprtc/CallActivity.java", | 74 "androidapp/src/org/appspot/apprtc/CallActivity.java", |
| 77 "androidapp/src/org/appspot/apprtc/CallFragment.java", | 75 "androidapp/src/org/appspot/apprtc/CallFragment.java", |
| 78 "androidapp/src/org/appspot/apprtc/CaptureQualityController.java", | 76 "androidapp/src/org/appspot/apprtc/CaptureQualityController.java", |
| (...skipping 17 matching lines...) Expand all Loading... |
| 96 ":AppRTCMobile_resources", | 94 ":AppRTCMobile_resources", |
| 97 "//webrtc/base:base_java", | 95 "//webrtc/base:base_java", |
| 98 "//webrtc/examples/androidapp/third_party/autobanh:autobanh_java", | 96 "//webrtc/examples/androidapp/third_party/autobanh:autobanh_java", |
| 99 "//webrtc/modules/audio_device:audio_device_java", | 97 "//webrtc/modules/audio_device:audio_device_java", |
| 100 "//webrtc/sdk/android:libjingle_peerconnection_java", | 98 "//webrtc/sdk/android:libjingle_peerconnection_java", |
| 101 "//webrtc/sdk/android:libjingle_peerconnection_metrics_default_java", | 99 "//webrtc/sdk/android:libjingle_peerconnection_metrics_default_java", |
| 102 ] | 100 ] |
| 103 } | 101 } |
| 104 | 102 |
| 105 android_resources("AppRTCMobile_resources") { | 103 android_resources("AppRTCMobile_resources") { |
| 106 testonly = true | |
| 107 resource_dirs = [ "androidapp/res" ] | 104 resource_dirs = [ "androidapp/res" ] |
| 108 custom_package = "org.appspot.apprtc" | 105 custom_package = "org.appspot.apprtc" |
| 109 } | 106 } |
| 110 | 107 |
| 111 instrumentation_test_apk("AppRTCMobileTest") { | 108 instrumentation_test_apk("AppRTCMobileTest") { |
| 112 apk_name = "AppRTCMobileTest" | 109 apk_name = "AppRTCMobileTest" |
| 113 android_manifest = "androidtests/AndroidManifest.xml" | 110 android_manifest = "androidtests/AndroidManifest.xml" |
| 114 | 111 |
| 115 java_files = [ "androidtests/src/org/appspot/apprtc/test/PeerConnectionClien
tTest.java" ] | 112 java_files = [ "androidtests/src/org/appspot/apprtc/test/PeerConnectionClien
tTest.java" ] |
| 116 | 113 |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 "-Wno-objc-missing-property-synthesis", | 162 "-Wno-objc-missing-property-synthesis", |
| 166 ] | 163 ] |
| 167 } | 164 } |
| 168 } | 165 } |
| 169 | 166 |
| 170 config("apprtc_common_config") { | 167 config("apprtc_common_config") { |
| 171 include_dirs = [ "objc/AppRTCMobile/common" ] | 168 include_dirs = [ "objc/AppRTCMobile/common" ] |
| 172 } | 169 } |
| 173 | 170 |
| 174 rtc_static_library("apprtc_common") { | 171 rtc_static_library("apprtc_common") { |
| 175 testonly = true | |
| 176 sources = [ | 172 sources = [ |
| 177 "objc/AppRTCMobile/common/ARDUtilities.h", | 173 "objc/AppRTCMobile/common/ARDUtilities.h", |
| 178 "objc/AppRTCMobile/common/ARDUtilities.m", | 174 "objc/AppRTCMobile/common/ARDUtilities.m", |
| 179 ] | 175 ] |
| 180 configs += [ | 176 configs += [ |
| 181 ":warnings_config", | 177 ":warnings_config", |
| 182 "//build/config/compiler:enable_arc", | 178 "//build/config/compiler:enable_arc", |
| 183 ] | 179 ] |
| 184 public_configs = [ ":apprtc_common_config" ] | 180 public_configs = [ ":apprtc_common_config" ] |
| 185 | 181 |
| 186 deps = [ | 182 deps = [ |
| 187 "//webrtc/sdk:rtc_sdk_common_objc", | 183 "../sdk:rtc_sdk_common_objc", |
| 188 "//webrtc/system_wrappers:field_trial_default", | 184 "../system_wrappers:field_trial_default", |
| 189 "//webrtc/system_wrappers:metrics_default", | 185 "../system_wrappers:metrics_default", |
| 190 ] | 186 ] |
| 191 } | 187 } |
| 192 | 188 |
| 193 config("apprtc_signaling_config") { | 189 config("apprtc_signaling_config") { |
| 194 include_dirs = [ "objc/AppRTCMobile" ] | 190 include_dirs = [ "objc/AppRTCMobile" ] |
| 195 | 191 |
| 196 # GN orders flags on a target before flags from configs. The default config | 192 # GN orders flags on a target before flags from configs. The default config |
| 197 # adds these flags so to cancel them out they need to come from a config and | 193 # adds these flags so to cancel them out they need to come from a config and |
| 198 # cannot be on the target directly. | 194 # cannot be on the target directly. |
| 199 cflags = [ | 195 cflags = [ |
| 200 "-Wno-sign-compare", | 196 "-Wno-sign-compare", |
| 201 "-Wno-unused-variable", | 197 "-Wno-unused-variable", |
| 202 ] | 198 ] |
| 203 } | 199 } |
| 204 | 200 |
| 205 rtc_static_library("apprtc_signaling") { | 201 rtc_static_library("apprtc_signaling") { |
| 206 testonly = true | |
| 207 sources = [ | 202 sources = [ |
| 208 "objc/AppRTCMobile/ARDAppClient+Internal.h", | 203 "objc/AppRTCMobile/ARDAppClient+Internal.h", |
| 209 "objc/AppRTCMobile/ARDAppClient.h", | 204 "objc/AppRTCMobile/ARDAppClient.h", |
| 210 "objc/AppRTCMobile/ARDAppClient.m", | 205 "objc/AppRTCMobile/ARDAppClient.m", |
| 211 "objc/AppRTCMobile/ARDAppEngineClient.h", | 206 "objc/AppRTCMobile/ARDAppEngineClient.h", |
| 212 "objc/AppRTCMobile/ARDAppEngineClient.m", | 207 "objc/AppRTCMobile/ARDAppEngineClient.m", |
| 213 "objc/AppRTCMobile/ARDBitrateTracker.h", | 208 "objc/AppRTCMobile/ARDBitrateTracker.h", |
| 214 "objc/AppRTCMobile/ARDBitrateTracker.m", | 209 "objc/AppRTCMobile/ARDBitrateTracker.m", |
| 215 "objc/AppRTCMobile/ARDJoinResponse+Internal.h", | 210 "objc/AppRTCMobile/ARDJoinResponse+Internal.h", |
| 216 "objc/AppRTCMobile/ARDJoinResponse.h", | 211 "objc/AppRTCMobile/ARDJoinResponse.h", |
| (...skipping 26 matching lines...) Expand all Loading... |
| 243 configs += [ | 238 configs += [ |
| 244 "//build/config/compiler:enable_arc", | 239 "//build/config/compiler:enable_arc", |
| 245 ":warnings_config", | 240 ":warnings_config", |
| 246 ] | 241 ] |
| 247 public_configs = [ ":apprtc_signaling_config" ] | 242 public_configs = [ ":apprtc_signaling_config" ] |
| 248 deps = [ | 243 deps = [ |
| 249 ":apprtc_common", | 244 ":apprtc_common", |
| 250 ":socketrocket", | 245 ":socketrocket", |
| 251 ] | 246 ] |
| 252 public_deps = [ | 247 public_deps = [ |
| 253 "//webrtc/sdk:rtc_sdk_peerconnection_objc", | 248 "../sdk:rtc_sdk_peerconnection_objc", |
| 254 ] | 249 ] |
| 255 libs = [ "QuartzCore.framework" ] | 250 libs = [ "QuartzCore.framework" ] |
| 256 } | 251 } |
| 257 | 252 |
| 258 if (is_ios) { | 253 if (is_ios) { |
| 259 rtc_static_library("AppRTCMobile_lib") { | 254 rtc_static_library("AppRTCMobile_lib") { |
| 260 testonly = true | |
| 261 sources = [ | 255 sources = [ |
| 262 "objc/AppRTCMobile/ios/ARDAppDelegate.m", | 256 "objc/AppRTCMobile/ios/ARDAppDelegate.m", |
| 263 "objc/AppRTCMobile/ios/ARDMainView.h", | 257 "objc/AppRTCMobile/ios/ARDMainView.h", |
| 264 "objc/AppRTCMobile/ios/ARDMainView.m", | 258 "objc/AppRTCMobile/ios/ARDMainView.m", |
| 265 "objc/AppRTCMobile/ios/ARDMainViewController.h", | 259 "objc/AppRTCMobile/ios/ARDMainViewController.h", |
| 266 "objc/AppRTCMobile/ios/ARDMainViewController.m", | 260 "objc/AppRTCMobile/ios/ARDMainViewController.m", |
| 267 "objc/AppRTCMobile/ios/ARDSettingsModel+Private.h", | 261 "objc/AppRTCMobile/ios/ARDSettingsModel+Private.h", |
| 268 "objc/AppRTCMobile/ios/ARDSettingsModel.h", | 262 "objc/AppRTCMobile/ios/ARDSettingsModel.h", |
| 269 "objc/AppRTCMobile/ios/ARDSettingsModel.m", | 263 "objc/AppRTCMobile/ios/ARDSettingsModel.m", |
| 270 "objc/AppRTCMobile/ios/ARDSettingsStore.h", | 264 "objc/AppRTCMobile/ios/ARDSettingsStore.h", |
| (...skipping 11 matching lines...) Expand all Loading... |
| 282 "objc/AppRTCMobile/ios/UIImage+ARDUtilities.m", | 276 "objc/AppRTCMobile/ios/UIImage+ARDUtilities.m", |
| 283 ] | 277 ] |
| 284 configs += [ | 278 configs += [ |
| 285 "//build/config/compiler:enable_arc", | 279 "//build/config/compiler:enable_arc", |
| 286 ":warnings_config", | 280 ":warnings_config", |
| 287 ] | 281 ] |
| 288 | 282 |
| 289 deps = [ | 283 deps = [ |
| 290 ":apprtc_common", | 284 ":apprtc_common", |
| 291 ":apprtc_signaling", | 285 ":apprtc_signaling", |
| 292 "//webrtc/modules/audio_device", | |
| 293 ] | 286 ] |
| 294 } | 287 } |
| 295 | 288 |
| 296 ios_app_bundle("AppRTCMobile") { | 289 ios_app_bundle("AppRTCMobile") { |
| 297 testonly = true | |
| 298 sources = [ | 290 sources = [ |
| 299 "objc/AppRTCMobile/ios/main.m", | 291 "objc/AppRTCMobile/ios/main.m", |
| 300 ] | 292 ] |
| 301 | 293 |
| 302 info_plist = "objc/AppRTCMobile/ios/Info.plist" | 294 info_plist = "objc/AppRTCMobile/ios/Info.plist" |
| 303 | 295 |
| 304 configs += [ "..:common_config" ] | 296 configs += [ "..:common_config" ] |
| 305 public_configs = [ "..:common_inherited_config" ] | 297 public_configs = [ "..:common_inherited_config" ] |
| 306 | 298 |
| 307 deps = [ | 299 deps = [ |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 "objc/Icon.png", | 339 "objc/Icon.png", |
| 348 ] | 340 ] |
| 349 outputs = [ | 341 outputs = [ |
| 350 "{{bundle_resources_dir}}/{{source_file_part}}", | 342 "{{bundle_resources_dir}}/{{source_file_part}}", |
| 351 ] | 343 ] |
| 352 } | 344 } |
| 353 } | 345 } |
| 354 | 346 |
| 355 if (is_mac) { | 347 if (is_mac) { |
| 356 rtc_static_library("AppRTCMobile_lib") { | 348 rtc_static_library("AppRTCMobile_lib") { |
| 357 testonly = true | |
| 358 sources = [ | 349 sources = [ |
| 359 "objc/AppRTCMobile/mac/APPRTCAppDelegate.h", | 350 "objc/AppRTCMobile/mac/APPRTCAppDelegate.h", |
| 360 "objc/AppRTCMobile/mac/APPRTCAppDelegate.m", | 351 "objc/AppRTCMobile/mac/APPRTCAppDelegate.m", |
| 361 "objc/AppRTCMobile/mac/APPRTCViewController.h", | 352 "objc/AppRTCMobile/mac/APPRTCViewController.h", |
| 362 "objc/AppRTCMobile/mac/APPRTCViewController.m", | 353 "objc/AppRTCMobile/mac/APPRTCViewController.m", |
| 363 ] | 354 ] |
| 364 configs += [ | 355 configs += [ |
| 365 "//webrtc:common_objc", | 356 "..:common_objc", |
| 366 "//build/config/compiler:enable_arc", | 357 "//build/config/compiler:enable_arc", |
| 367 ] | 358 ] |
| 368 deps = [ | 359 deps = [ |
| 369 ":apprtc_common", | 360 ":apprtc_common", |
| 370 ":apprtc_signaling", | 361 ":apprtc_signaling", |
| 371 ] | 362 ] |
| 372 } | 363 } |
| 373 | 364 |
| 374 mac_app_bundle("AppRTCMobile") { | 365 mac_app_bundle("AppRTCMobile") { |
| 375 testonly = true | |
| 376 output_name = "AppRTCMobile" | 366 output_name = "AppRTCMobile" |
| 377 | 367 |
| 378 sources = [ | 368 sources = [ |
| 379 "objc/AppRTCMobile/mac/main.m", | 369 "objc/AppRTCMobile/mac/main.m", |
| 380 ] | 370 ] |
| 381 | 371 |
| 382 public_configs = [ "..:common_inherited_config" ] | 372 public_configs = [ "..:common_inherited_config" ] |
| 383 | 373 |
| 384 info_plist = "objc/AppRTCMobile/mac/Info.plist" | 374 info_plist = "objc/AppRTCMobile/mac/Info.plist" |
| 385 | 375 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 406 "-Wno-unused-variable", | 396 "-Wno-unused-variable", |
| 407 ] | 397 ] |
| 408 | 398 |
| 409 cflags_objc = [ | 399 cflags_objc = [ |
| 410 # Enabled for cflags_objc in build/config/compiler/BUILD.gn. | 400 # Enabled for cflags_objc in build/config/compiler/BUILD.gn. |
| 411 "-Wno-objc-missing-property-synthesis", | 401 "-Wno-objc-missing-property-synthesis", |
| 412 ] | 402 ] |
| 413 } | 403 } |
| 414 | 404 |
| 415 rtc_static_library("socketrocket") { | 405 rtc_static_library("socketrocket") { |
| 416 testonly = true | |
| 417 sources = [ | 406 sources = [ |
| 418 "objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.h", | 407 "objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.h", |
| 419 "objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m", | 408 "objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m", |
| 420 ] | 409 ] |
| 421 configs += [ | 410 configs += [ |
| 422 "//build/config/compiler:enable_arc", | 411 "//build/config/compiler:enable_arc", |
| 423 ":socketrocket_warning_config", | 412 ":socketrocket_warning_config", |
| 424 ] | 413 ] |
| 425 public_configs = [ ":socketrocket_include_config" ] | 414 public_configs = [ ":socketrocket_include_config" ] |
| 426 | 415 |
| 427 libs = [ | 416 libs = [ |
| 428 "CFNetwork.framework", | 417 "CFNetwork.framework", |
| 429 "icucore", | 418 "icucore", |
| 430 ] | 419 ] |
| 431 } | 420 } |
| 432 | 421 |
| 433 if (rtc_include_tests) { | 422 if (rtc_include_tests) { |
| 434 # TODO(kthelgason): compile xctests on mac when chromium supports it. | 423 # TODO(kthelgason): compile xctests on mac when chromium supports it. |
| 435 if (is_ios) { | 424 if (is_ios) { |
| 436 rtc_source_set("apprtcmobile_test_sources") { | 425 rtc_source_set("apprtcmobile_test_sources") { |
| 437 testonly = true | |
| 438 include_dirs = [ | 426 include_dirs = [ |
| 439 "objc/AppRTCMobile", | 427 "objc/AppRTCMobile", |
| 440 "objc/AppRTCMobile/ios", | 428 "objc/AppRTCMobile/ios", |
| 441 ] | 429 ] |
| 442 testonly = true | 430 testonly = true |
| 443 sources = [ | 431 sources = [ |
| 444 "objc/AppRTCMobile/tests/ARDAppClient_xctest.mm", | 432 "objc/AppRTCMobile/tests/ARDAppClient_xctest.mm", |
| 445 "objc/AppRTCMobile/tests/ARDSDPUtils_xctest.mm", | 433 "objc/AppRTCMobile/tests/ARDSDPUtils_xctest.mm", |
| 446 "objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm", | 434 "objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm", |
| 447 ] | 435 ] |
| 448 deps = [ | |
| 449 "//webrtc/base:rtc_base", | |
| 450 ] | |
| 451 public_deps = [ | 436 public_deps = [ |
| 452 ":AppRTCMobile_ios_frameworks", | 437 ":AppRTCMobile_ios_frameworks", |
| 453 ":AppRTCMobile_lib", | 438 ":AppRTCMobile_lib", |
| 454 "//build/config/ios:xctest", | 439 "//build/config/ios:xctest", |
| 455 "//third_party/ocmock", | 440 "//third_party/ocmock", |
| 456 ] | 441 ] |
| 457 configs += [ "//build/config/compiler:enable_arc" ] | 442 configs += [ "//build/config/compiler:enable_arc" ] |
| 458 } | 443 } |
| 459 | 444 |
| 460 rtc_ios_xctest_test("apprtcmobile_tests") { | 445 rtc_ios_xctest_test("apprtcmobile_tests") { |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 495 | 480 |
| 496 if (is_clang) { | 481 if (is_clang) { |
| 497 # TODO(ehmaldonado): Make peerconnection_client compile with the standard | 482 # TODO(ehmaldonado): Make peerconnection_client compile with the standard |
| 498 # set of warnings. | 483 # set of warnings. |
| 499 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6306 | 484 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6306 |
| 500 cflags += [ "-Wno-inconsistent-missing-override" ] | 485 cflags += [ "-Wno-inconsistent-missing-override" ] |
| 501 } | 486 } |
| 502 } | 487 } |
| 503 | 488 |
| 504 rtc_executable("peerconnection_client") { | 489 rtc_executable("peerconnection_client") { |
| 505 testonly = true | |
| 506 sources = [ | 490 sources = [ |
| 507 "peerconnection/client/conductor.cc", | 491 "peerconnection/client/conductor.cc", |
| 508 "peerconnection/client/conductor.h", | 492 "peerconnection/client/conductor.h", |
| 509 "peerconnection/client/defaults.cc", | 493 "peerconnection/client/defaults.cc", |
| 510 "peerconnection/client/defaults.h", | 494 "peerconnection/client/defaults.h", |
| 511 "peerconnection/client/peer_connection_client.cc", | 495 "peerconnection/client/peer_connection_client.cc", |
| 512 "peerconnection/client/peer_connection_client.h", | 496 "peerconnection/client/peer_connection_client.h", |
| 513 ] | 497 ] |
| 514 | 498 |
| 515 if (!build_with_chromium && is_clang) { | 499 if (!build_with_chromium && is_clang) { |
| 516 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 500 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 517 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 501 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 518 } | 502 } |
| 519 deps = [] | |
| 520 if (is_win) { | 503 if (is_win) { |
| 521 sources += [ | 504 sources += [ |
| 522 "peerconnection/client/flagdefs.h", | 505 "peerconnection/client/flagdefs.h", |
| 523 "peerconnection/client/main.cc", | 506 "peerconnection/client/main.cc", |
| 524 "peerconnection/client/main_wnd.cc", | 507 "peerconnection/client/main_wnd.cc", |
| 525 "peerconnection/client/main_wnd.h", | 508 "peerconnection/client/main_wnd.h", |
| 526 ] | 509 ] |
| 527 cflags = [ "/wd4245" ] | 510 cflags = [ "/wd4245" ] |
| 528 configs += [ "//build/config/win:windowed" ] | 511 configs += [ "//build/config/win:windowed" ] |
| 529 deps += [ "//webrtc/media:rtc_media_base" ] | |
| 530 } | 512 } |
| 513 deps = [ |
| 514 "//third_party/libyuv", |
| 515 "//webrtc/pc:libjingle_peerconnection", |
| 516 "//webrtc/system_wrappers:field_trial_default", |
| 517 "//webrtc/system_wrappers:metrics_default", |
| 518 ] |
| 531 if (is_linux) { | 519 if (is_linux) { |
| 532 sources += [ | 520 sources += [ |
| 533 "peerconnection/client/linux/main.cc", | 521 "peerconnection/client/linux/main.cc", |
| 534 "peerconnection/client/linux/main_wnd.cc", | 522 "peerconnection/client/linux/main_wnd.cc", |
| 535 "peerconnection/client/linux/main_wnd.h", | 523 "peerconnection/client/linux/main_wnd.h", |
| 536 ] | 524 ] |
| 537 libs = [ | 525 libs = [ |
| 538 "X11", | 526 "X11", |
| 539 "Xcomposite", | 527 "Xcomposite", |
| 540 "Xext", | 528 "Xext", |
| 541 "Xrender", | 529 "Xrender", |
| 542 ] | 530 ] |
| 543 deps += [ "//build/config/linux/gtk" ] | 531 deps += [ "//build/config/linux/gtk" ] |
| 544 } | 532 } |
| 545 configs += [ ":peerconnection_client_warnings_config" ] | 533 configs += [ ":peerconnection_client_warnings_config" ] |
| 546 | |
| 547 deps += [ | |
| 548 "//third_party/libyuv", | |
| 549 "//webrtc/api:libjingle_peerconnection_test_api", | |
| 550 "//webrtc/api:video_frame_api", | |
| 551 "//webrtc/base:rtc_base", | |
| 552 "//webrtc/base:rtc_base_approved", | |
| 553 "//webrtc/media:rtc_media", | |
| 554 "//webrtc/modules/video_capture:video_capture_module", | |
| 555 "//webrtc/pc:libjingle_peerconnection", | |
| 556 "//webrtc/system_wrappers:field_trial_default", | |
| 557 "//webrtc/system_wrappers:metrics_default", | |
| 558 ] | |
| 559 if (rtc_build_json) { | 534 if (rtc_build_json) { |
| 560 deps += [ "//third_party/jsoncpp" ] | 535 deps += [ "//third_party/jsoncpp" ] |
| 561 } | 536 } |
| 562 } | 537 } |
| 563 | 538 |
| 564 rtc_executable("peerconnection_server") { | 539 rtc_executable("peerconnection_server") { |
| 565 testonly = true | |
| 566 sources = [ | 540 sources = [ |
| 567 "peerconnection/server/data_socket.cc", | 541 "peerconnection/server/data_socket.cc", |
| 568 "peerconnection/server/data_socket.h", | 542 "peerconnection/server/data_socket.h", |
| 569 "peerconnection/server/main.cc", | 543 "peerconnection/server/main.cc", |
| 570 "peerconnection/server/peer_channel.cc", | 544 "peerconnection/server/peer_channel.cc", |
| 571 "peerconnection/server/peer_channel.h", | 545 "peerconnection/server/peer_channel.h", |
| 572 "peerconnection/server/utils.cc", | 546 "peerconnection/server/utils.cc", |
| 573 "peerconnection/server/utils.h", | 547 "peerconnection/server/utils.h", |
| 574 ] | 548 ] |
| 575 deps = [ | 549 deps = [ |
| 576 "//webrtc:webrtc_common", | 550 "//webrtc:webrtc_common", |
| 577 "//webrtc/base:rtc_base_approved", | 551 "//webrtc/base:rtc_base_approved", |
| 578 "//webrtc/tools:command_line_parser", | 552 "//webrtc/tools:command_line_parser", |
| 579 ] | 553 ] |
| 580 if (!build_with_chromium && is_clang) { | 554 if (!build_with_chromium && is_clang) { |
| 581 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 555 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 582 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 556 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 583 } | 557 } |
| 584 } | 558 } |
| 585 rtc_executable("relayserver") { | 559 rtc_executable("relayserver") { |
| 586 testonly = true | |
| 587 sources = [ | 560 sources = [ |
| 588 "relayserver/relayserver_main.cc", | 561 "relayserver/relayserver_main.cc", |
| 589 ] | 562 ] |
| 590 deps = [ | 563 deps = [ |
| 591 "../base:rtc_base", | |
| 592 "//webrtc/base:rtc_base_approved", | 564 "//webrtc/base:rtc_base_approved", |
| 593 "//webrtc/p2p:rtc_p2p", | |
| 594 "//webrtc/pc:rtc_pc", | 565 "//webrtc/pc:rtc_pc", |
| 595 "//webrtc/system_wrappers:field_trial_default", | 566 "//webrtc/system_wrappers:field_trial_default", |
| 596 "//webrtc/system_wrappers:metrics_default", | 567 "//webrtc/system_wrappers:metrics_default", |
| 597 ] | 568 ] |
| 598 if (!build_with_chromium && is_clang) { | 569 if (!build_with_chromium && is_clang) { |
| 599 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 570 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 600 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 571 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 601 } | 572 } |
| 602 } | 573 } |
| 603 rtc_executable("turnserver") { | 574 rtc_executable("turnserver") { |
| 604 testonly = true | |
| 605 sources = [ | 575 sources = [ |
| 606 "turnserver/turnserver_main.cc", | 576 "turnserver/turnserver_main.cc", |
| 607 ] | 577 ] |
| 608 deps = [ | 578 deps = [ |
| 609 "../base:rtc_base", | |
| 610 "//webrtc/base:rtc_base_approved", | 579 "//webrtc/base:rtc_base_approved", |
| 611 "//webrtc/p2p:rtc_p2p", | |
| 612 "//webrtc/pc:rtc_pc", | 580 "//webrtc/pc:rtc_pc", |
| 613 "//webrtc/system_wrappers:field_trial_default", | 581 "//webrtc/system_wrappers:field_trial_default", |
| 614 "//webrtc/system_wrappers:metrics_default", | 582 "//webrtc/system_wrappers:metrics_default", |
| 615 ] | 583 ] |
| 616 if (!build_with_chromium && is_clang) { | 584 if (!build_with_chromium && is_clang) { |
| 617 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 585 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 618 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 586 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 619 } | 587 } |
| 620 } | 588 } |
| 621 rtc_executable("stunserver") { | 589 rtc_executable("stunserver") { |
| 622 testonly = true | |
| 623 sources = [ | 590 sources = [ |
| 624 "stunserver/stunserver_main.cc", | 591 "stunserver/stunserver_main.cc", |
| 625 ] | 592 ] |
| 626 deps = [ | 593 deps = [ |
| 627 "../base:rtc_base", | |
| 628 "//webrtc/base:rtc_base_approved", | 594 "//webrtc/base:rtc_base_approved", |
| 629 "//webrtc/p2p:rtc_p2p", | |
| 630 "//webrtc/pc:rtc_pc", | 595 "//webrtc/pc:rtc_pc", |
| 631 "//webrtc/system_wrappers:field_trial_default", | 596 "//webrtc/system_wrappers:field_trial_default", |
| 632 "//webrtc/system_wrappers:metrics_default", | 597 "//webrtc/system_wrappers:metrics_default", |
| 633 ] | 598 ] |
| 634 if (!build_with_chromium && is_clang) { | 599 if (!build_with_chromium && is_clang) { |
| 635 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 600 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 636 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 601 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 637 } | 602 } |
| 638 } | 603 } |
| 639 } | 604 } |
| 640 | 605 |
| 641 if (!build_with_chromium) { | 606 if (!build_with_chromium) { |
| 642 # Doesn't build within Chrome on Win. | 607 # Doesn't build within Chrome on Win. |
| 643 rtc_executable("stun_prober") { | 608 rtc_executable("stun_prober") { |
| 644 testonly = true | |
| 645 sources = [ | 609 sources = [ |
| 646 "stunprober/main.cc", | 610 "stunprober/main.cc", |
| 647 ] | 611 ] |
| 648 | 612 |
| 649 if (!build_with_chromium && is_clang) { | 613 if (!build_with_chromium && is_clang) { |
| 650 # Suppress warnings from Chrome's Clang plugins. | 614 # Suppress warnings from Chrome's Clang plugins. |
| 651 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 615 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 652 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 616 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 653 } | 617 } |
| 654 | 618 |
| 655 deps = [ | 619 deps = [ |
| 656 "../base:rtc_base", | |
| 657 "../base:rtc_base_approved", | |
| 658 "../p2p:libstunprober", | 620 "../p2p:libstunprober", |
| 659 "../p2p:rtc_p2p", | 621 "../p2p:rtc_p2p", |
| 660 "../system_wrappers:field_trial_default", | 622 "../system_wrappers:field_trial_default", |
| 661 ] | 623 ] |
| 662 } | 624 } |
| 663 } | 625 } |
| OLD | NEW |