This reverts commit 42d8c93ec351b68554825b58a3dc6525a7dc84da. Reason for revert: Got Aliby for FEC test flakes Original change's description: > Revert "Delete rtc::TaskQueue::Current in favor of webrtc::TaskQueueBase::Current" > > This reverts commit 304e9d2df347630d71fd4423f5971f30dac73e41. > > Reason for revert: Breaks downstream projects. > Seems to make VideoSendStreamTest.SupportsFlexfecSimulcastVp8 flaky. > > Original change's description: > > Delete rtc::TaskQueue::Current in favor of webrtc::TaskQueueBase::Current > > > > Bug: webrtc:10191 > > Change-Id: I506cc50a90c73a6a4f6a3de36de0999cca72f5ba > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126230 > > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> > > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#27035} > > TBR=danilchap@webrtc.org,kwiberg@webrtc.org > > Change-Id: If98324f88e4b3d18bf2fe33597dfb9711867c243 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:10191 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126484 > Reviewed-by: Yves Gerey <yvesg@webrtc.org> > Commit-Queue: Yves Gerey <yvesg@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#27041} TBR=danilchap@webrtc.org,kwiberg@webrtc.org,yvesg@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:10191 Change-Id: Id87a17ae415142b8e0b11ba03ae7bad84a473fb0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126720 Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Reviewed-by: Yves Gerey <yvesg@webrtc.org> Commit-Queue: Yves Gerey <yvesg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27056}
160 lines
3.9 KiB
Plaintext
160 lines
3.9 KiB
Plaintext
# Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license
|
|
# that can be found in the LICENSE file in the root of the source
|
|
# tree. An additional intellectual property rights grant can be found
|
|
# in the file PATENTS. All contributing project authors may
|
|
# be found in the AUTHORS file in the root of the source tree.
|
|
|
|
import("../../webrtc.gni")
|
|
if (rtc_enable_protobuf) {
|
|
import("//third_party/protobuf/proto_library.gni")
|
|
}
|
|
|
|
if (rtc_enable_protobuf) {
|
|
proto_library("network_tester_config_proto") {
|
|
sources = [
|
|
"network_tester_config.proto",
|
|
]
|
|
proto_out_dir = "rtc_tools/network_tester"
|
|
}
|
|
|
|
proto_library("network_tester_packet_proto") {
|
|
sources = [
|
|
"network_tester_packet.proto",
|
|
]
|
|
proto_out_dir = "rtc_tools/network_tester"
|
|
}
|
|
|
|
rtc_static_library("network_tester") {
|
|
sources = [
|
|
"config_reader.cc",
|
|
"config_reader.h",
|
|
"packet_logger.cc",
|
|
"packet_logger.h",
|
|
"packet_sender.cc",
|
|
"packet_sender.h",
|
|
"test_controller.cc",
|
|
"test_controller.h",
|
|
]
|
|
|
|
defines = [ "WEBRTC_NETWORK_TESTER_PROTO" ]
|
|
|
|
deps = [
|
|
":network_tester_config_proto",
|
|
":network_tester_packet_proto",
|
|
"../../api/task_queue",
|
|
"../../p2p",
|
|
"../../rtc_base:checks",
|
|
"../../rtc_base:protobuf_utils",
|
|
"../../rtc_base:rtc_base",
|
|
"../../rtc_base:rtc_base_approved",
|
|
"../../rtc_base:rtc_task_queue",
|
|
"../../rtc_base:sequenced_task_checker",
|
|
"../../rtc_base/third_party/sigslot:sigslot",
|
|
"//third_party/abseil-cpp/absl/types:optional",
|
|
]
|
|
}
|
|
|
|
network_tester_unittests_resources = [
|
|
"../../resources/network_tester/client_config.dat",
|
|
"../../resources/network_tester/server_config.dat",
|
|
]
|
|
|
|
if (is_ios) {
|
|
bundle_data("network_tester_unittests_bundle_data") {
|
|
testonly = true
|
|
sources = network_tester_unittests_resources
|
|
outputs = [
|
|
"{{bundle_resources_dir}}/{{source_file_part}}",
|
|
]
|
|
}
|
|
}
|
|
|
|
rtc_source_set("network_tester_unittests") {
|
|
testonly = true
|
|
|
|
sources = [
|
|
"network_tester_unittest.cc",
|
|
]
|
|
|
|
deps = [
|
|
":network_tester",
|
|
"../../rtc_base:gunit_helpers",
|
|
"../../test:fileutils",
|
|
"../../test:test_support",
|
|
"//testing/gtest",
|
|
]
|
|
|
|
if (is_ios) {
|
|
deps += [ ":network_tester_unittests_bundle_data" ]
|
|
}
|
|
|
|
defines = [ "WEBRTC_NETWORK_TESTER_TEST_ENABLED" ]
|
|
|
|
data = network_tester_unittests_resources
|
|
}
|
|
|
|
rtc_executable("network_tester_server") {
|
|
sources = [
|
|
"server.cc",
|
|
]
|
|
|
|
deps = [
|
|
":network_tester",
|
|
]
|
|
}
|
|
}
|
|
|
|
if (is_android) {
|
|
android_apk("NetworkTesterMobile") {
|
|
testonly = true
|
|
apk_name = "NetworkTesterMobile"
|
|
android_manifest = "androidapp/AndroidManifest.xml"
|
|
|
|
deps = [
|
|
":NetworkTesterMobile_javalib",
|
|
":NetworkTesterMobile_resources",
|
|
"../../rtc_base:base_java",
|
|
]
|
|
|
|
shared_libraries = [ "../../rtc_tools/network_tester:network_tester_so" ]
|
|
}
|
|
|
|
android_library("NetworkTesterMobile_javalib") {
|
|
testonly = true
|
|
android_manifest_for_lint = "androidapp/AndroidManifest.xml"
|
|
|
|
java_files = [
|
|
"androidapp/src/com/google/media/networktester/MainActivity.java",
|
|
"androidapp/src/com/google/media/networktester/NetworkTester.java",
|
|
]
|
|
|
|
deps = [
|
|
":NetworkTesterMobile_resources",
|
|
"../../rtc_base:base_java",
|
|
]
|
|
}
|
|
|
|
android_resources("NetworkTesterMobile_resources") {
|
|
testonly = true
|
|
resource_dirs = [ "androidapp/res" ]
|
|
custom_package = "com.google.media.networktester"
|
|
}
|
|
|
|
rtc_shared_library("network_tester_so") {
|
|
sources = [
|
|
"jni.cpp",
|
|
]
|
|
|
|
deps = [
|
|
":network_tester",
|
|
]
|
|
|
|
suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ]
|
|
configs += [ "//build/config/android:hide_all_but_jni" ]
|
|
|
|
output_extension = "so"
|
|
}
|
|
}
|