317a1f09ed
WebRTC is now using C++14 so there is no need to use the Abseil version of std::make_unique. This CL has been created with the following steps: git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \ uniq > /tmp/only_make_unique.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/only_make_unique.txt /tmp/memory.txt | \ xargs grep -l "absl/memory" > /tmp/add-memory.txt git grep -l "\babsl::make_unique\b" | \ xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g" git checkout PRESUBMIT.py abseil-in-webrtc.md cat /tmp/add-memory.txt | \ xargs sed -i \ 's/#include "absl\/memory\/memory.h"/#include <memory>/g' git cl format # Manual fix order of the new inserted #include <memory> cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \ xargs sed -i '/#include "absl\/memory\/memory.h"/d' git ls-files | grep BUILD.gn | \ xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d' python tools_webrtc/gn_check_autofix.py \ -m tryserver.webrtc -b linux_rel # Repead the gn_check_autofix step for other platforms git ls-files | grep BUILD.gn | \ xargs sed -i 's/absl\/memory:memory/absl\/memory/g' git cl format Bug: webrtc:10945 Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29209}
163 lines
4.0 KiB
Plaintext
163 lines
4.0 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",
|
|
"../../api/task_queue:default_task_queue_factory",
|
|
"../../p2p",
|
|
"../../rtc_base",
|
|
"../../rtc_base:checks",
|
|
"../../rtc_base:protobuf_utils",
|
|
"../../rtc_base:rtc_base_approved",
|
|
"../../rtc_base:rtc_task_queue",
|
|
"../../rtc_base/synchronization:sequence_checker",
|
|
"../../rtc_base/third_party/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) {
|
|
rtc_android_apk("NetworkTesterMobile") {
|
|
testonly = true
|
|
apk_name = "NetworkTesterMobile"
|
|
android_manifest = "androidapp/AndroidManifest.xml"
|
|
min_sdk_version = 17
|
|
target_sdk_version = 24
|
|
|
|
deps = [
|
|
":NetworkTesterMobile_javalib",
|
|
":NetworkTesterMobile_resources",
|
|
"../../rtc_base:base_java",
|
|
]
|
|
|
|
shared_libraries = [ "../../rtc_tools/network_tester:network_tester_so" ]
|
|
}
|
|
|
|
rtc_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"
|
|
}
|
|
}
|