Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

185 lines
5.2 KiB
Plaintext
Raw Normal View History

# 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_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:sequence_checker",
Reland "Delete rtc::TaskQueue::Current in favor of webrtc::TaskQueueBase::Current" 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}
2019-03-11 10:28:05 +00:00
"../../api/task_queue",
"../../api/task_queue:default_task_queue_factory",
"../../api/task_queue:pending_task_safety_flag",
"../../api/units:timestamp",
"../../p2p:basic_packet_socket_factory",
"../../rtc_base:async_packet_socket",
"../../rtc_base:checks",
Reland "Refactor rtc_base build targets." This is a reland of 69241a93fb14f6527a26d5c94dde879013012d2a Fix: The problem was related to NO_MAIN_THREAD_WRAPPING, which affects https://source.chromium.org/chromium/chromium/src/+/master:third_party/webrtc/rtc_base/thread.cc;l=257-263;drc=7acc2d9fe3a6e3c4d8881d2bdfc9b8968a724cd5. The original CL didn't attach the definition of the macro NO_MAIN_THREAD_WRAPPING when building for Chromium (which doesn't have to be related to //rtc_base anymore but to //rtc_base:threading). Original change's description: > Refactor rtc_base build targets. > > The "//rtc_base:rtc_base" build target has historically been one of the > biggest targets in the WebRTC build. Big targets are the main source of > circular dependencies and non-API types leakage. > > This CL is a step forward into splitting "//rtc_base:rtc_base" into > smaller targets (as originally started in 2018). > > The only non-automated changes are (like re-wiring the build system): > * The creation of //rtc_base/async_resolver.{h,cc} which allows to > break a circular dependency (is has been extracted from > //rtc_base/net_helpers.{h,cc}). > * The creation of //rtc_base/internal/default_socket_server.{h,cc} to > break another circular dependency. > > Bug: webrtc:9987 > Change-Id: I0c8f5e7efe2c8fd8e6bffa0d6dd2dd494cf3df02 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196903 > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#32941} Bug: webrtc:9987 Change-Id: I7cdf49d2aac8357f1f50f90010bf2c2f62fa19f6 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/202021 Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33001}
2021-01-15 10:41:01 +01:00
"../../rtc_base:ip_address",
"../../rtc_base:logging",
"../../rtc_base:macromagic",
"../../rtc_base:protobuf_utils",
Reland "Refactor rtc_base build targets." This is a reland of 69241a93fb14f6527a26d5c94dde879013012d2a Fix: The problem was related to NO_MAIN_THREAD_WRAPPING, which affects https://source.chromium.org/chromium/chromium/src/+/master:third_party/webrtc/rtc_base/thread.cc;l=257-263;drc=7acc2d9fe3a6e3c4d8881d2bdfc9b8968a724cd5. The original CL didn't attach the definition of the macro NO_MAIN_THREAD_WRAPPING when building for Chromium (which doesn't have to be related to //rtc_base anymore but to //rtc_base:threading). Original change's description: > Refactor rtc_base build targets. > > The "//rtc_base:rtc_base" build target has historically been one of the > biggest targets in the WebRTC build. Big targets are the main source of > circular dependencies and non-API types leakage. > > This CL is a step forward into splitting "//rtc_base:rtc_base" into > smaller targets (as originally started in 2018). > > The only non-automated changes are (like re-wiring the build system): > * The creation of //rtc_base/async_resolver.{h,cc} which allows to > break a circular dependency (is has been extracted from > //rtc_base/net_helpers.{h,cc}). > * The creation of //rtc_base/internal/default_socket_server.{h,cc} to > break another circular dependency. > > Bug: webrtc:9987 > Change-Id: I0c8f5e7efe2c8fd8e6bffa0d6dd2dd494cf3df02 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196903 > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#32941} Bug: webrtc:9987 Change-Id: I7cdf49d2aac8357f1f50f90010bf2c2f62fa19f6 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/202021 Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33001}
2021-01-15 10:41:01 +01:00
"../../rtc_base:socket_address",
"../../rtc_base:socket_server",
Reland "Refactor rtc_base build targets." This is a reland of 69241a93fb14f6527a26d5c94dde879013012d2a Fix: The problem was related to NO_MAIN_THREAD_WRAPPING, which affects https://source.chromium.org/chromium/chromium/src/+/master:third_party/webrtc/rtc_base/thread.cc;l=257-263;drc=7acc2d9fe3a6e3c4d8881d2bdfc9b8968a724cd5. The original CL didn't attach the definition of the macro NO_MAIN_THREAD_WRAPPING when building for Chromium (which doesn't have to be related to //rtc_base anymore but to //rtc_base:threading). Original change's description: > Refactor rtc_base build targets. > > The "//rtc_base:rtc_base" build target has historically been one of the > biggest targets in the WebRTC build. Big targets are the main source of > circular dependencies and non-API types leakage. > > This CL is a step forward into splitting "//rtc_base:rtc_base" into > smaller targets (as originally started in 2018). > > The only non-automated changes are (like re-wiring the build system): > * The creation of //rtc_base/async_resolver.{h,cc} which allows to > break a circular dependency (is has been extracted from > //rtc_base/net_helpers.{h,cc}). > * The creation of //rtc_base/internal/default_socket_server.{h,cc} to > break another circular dependency. > > Bug: webrtc:9987 > Change-Id: I0c8f5e7efe2c8fd8e6bffa0d6dd2dd494cf3df02 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196903 > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#32941} Bug: webrtc:9987 Change-Id: I7cdf49d2aac8357f1f50f90010bf2c2f62fa19f6 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/202021 Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33001}
2021-01-15 10:41:01 +01:00
"../../rtc_base:threading",
"../../rtc_base:timeutils",
"../../rtc_base/network:received_packet",
"../../rtc_base/synchronization:mutex",
"../../rtc_base/system:no_unique_address",
"//third_party/abseil-cpp/absl/functional:any_invocable",
]
}
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_library("network_tester_unittests") {
testonly = true
sources = [ "network_tester_unittest.cc" ]
deps = [
":network_tester",
"../../api:rtc_error_matchers",
"../../rtc_base:gunit_helpers",
"../../rtc_base:random",
"../../rtc_base:threading",
"../../test:fileutils",
"../../test:test_support",
"../../test:wait_until",
"//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",
"../../rtc_base:null_socket_server",
"../../rtc_base:threading",
]
}
}
if (is_android) {
Roll chromium_revision 6ae0f0cd4c..bf62d746a4 (669703:669828) + fix AndroidManifest In https://chromium-review.googlesource.com/1650265 attributes like minSdkVersion were moved from AndroidManifest.xml to GN files. For WebRTC there were a few problems with that. * We don't want to suppress UsesMinSdkAttributes lint but now there are these "invalid" manifest files that we can't exclude or discern. So disable this lint error. https://chromium-review.googlesource.com/c/chromium/src/+/1650265/14/build/android/AndroidManifest.xml * We should specify the versions in GN files, so I did that here (by exactly copying the versions that are already in the targets' corresponding XML files), but we never want to get rid of them in the XML files. For now this information will just be duplicated (without any synchronicity check!) so there should be followup to this. Change log: https://chromium.googlesource.com/chromium/src/+log/6ae0f0cd4c..bf62d746a4 Full diff: https://chromium.googlesource.com/chromium/src/+/6ae0f0cd4c..bf62d746a4 Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/9e5e9332df..e5a1d1f652 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/5a031748ec..2ef566e990 * src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/6ae683be2f..6f3775ad6e * src/buildtools/linux64: git_revision:8c7f49102234f4f4b9349dcb258554675475e596..git_revision:81ee1967d3fcbc829bac1c005c3da59739c88df9 * src/buildtools/mac: git_revision:8c7f49102234f4f4b9349dcb258554675475e596..git_revision:81ee1967d3fcbc829bac1c005c3da59739c88df9 * src/buildtools/win: git_revision:8c7f49102234f4f4b9349dcb258554675475e596..git_revision:81ee1967d3fcbc829bac1c005c3da59739c88df9 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/2f5c817266..7f1a97d593 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/1d4247de57..b1b36ff0d4 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/6f7cbf7c46..42e96c4074 * src/third_party/android_sdk/public: ki7EDQRAiZAUYlnTWR1XmI6cJTk65fJ-DNZUU1zrtS8C..xhyuoquVvBTcJelgRjMKZeoBVSQRjB7pLVJPt5C9saIC * src/third_party/android_sdk/public: iIwhhDox5E-mHgwUhCz8JACWQCpUjdqt5KTY9VLugKQC..ppQ4TnqDvBHQ3lXx5KPq97egzF5X2FFyOrVHkGmiTMQC * src/third_party/android_sdk/public: 4Y2Cb2LGzoc-qt-oIUIlhySotJaKeE3ELFedSVe6Uk8C..MSnxgXN7IurL-MQs1RrTkSFSb8Xd1UtZjLArI8Ty1FgC * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/ed9fcf3f70..9e5dbd8b46 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/f58f33bca1..a9a4b8fc7b DEPS diff: https://chromium.googlesource.com/chromium/src/+/6ae0f0cd4c..bf62d746a4/DEPS No update to Clang. Bug: chromium:891996 Change-Id: I773d6fa90e8083d934c84eecc1cb9d7d4496eca0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/142235 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Oleh Prypin <oprypin@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28311}
2019-06-18 17:09:51 +02:00
rtc_android_apk("NetworkTesterMobile") {
testonly = true
apk_name = "NetworkTesterMobile"
android_manifest = "androidapp/AndroidManifest.xml"
Roll chromium_revision 4d95e6c77b..71a0e1904e (776481:782339) Change log: https://chromium.googlesource.com/chromium/src/+log/4d95e6c77b..71a0e1904e Full diff: https://chromium.googlesource.com/chromium/src/+/4d95e6c77b..71a0e1904e Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/2df7267880..736d9fb42c * src/build: https://chromium.googlesource.com/chromium/src/build/+log/a03951acb9..876a780600 * src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/1b066f0216..1ed99573d5 * src/buildtools/linux64: git_revision:d0a6f072070988e7b038496c4e7d6c562b649732..git_revision:7d7e8deea36d126397bda2cf924682504271f0e1 * src/buildtools/mac: git_revision:d0a6f072070988e7b038496c4e7d6c562b649732..git_revision:7d7e8deea36d126397bda2cf924682504271f0e1 * src/buildtools/win: git_revision:d0a6f072070988e7b038496c4e7d6c562b649732..git_revision:7d7e8deea36d126397bda2cf924682504271f0e1 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/9200aad36b..73c8bcb1b1 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/502600d41a..77ba7104d5 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/e0df6e10ad..1908162da7 * src/third_party/android_deps/libs/androidx_activity_activity: version:1.0.0-cr0..version:1.1.0-cr0 * src/third_party/android_deps/libs/androidx_arch_core_core_runtime: version:2.0.0-cr0..version:2.1.0-cr0 * src/third_party/android_deps/libs/androidx_fragment_fragment: version:1.1.0-cr0..version:1.2.5-cr0 * src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common: version:2.1.0-cr0..version:2.2.0-cr0 * src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata_core: version:2.0.0-cr0..version:2.2.0-cr0 * src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_runtime: version:2.1.0-cr0..version:2.2.0-cr0 * src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel: version:2.1.0-cr0..version:2.2.0-cr0 * src/third_party/android_deps/libs/androidx_preference_preference: version:1.0.0-cr0..version:1.1.1-cr0 * src/third_party/android_deps/libs/org_robolectric_shadows_multidex: version:4.3.1-cr0..version:4.3.1-cr1 * src/third_party/android_sdk/public: CR25ixsRhwuRnhdgDpGFyl9S0C_0HO9SUgFrwX46zq8C..uM0XtAW9BHh8phcbhBDA9GfzP3bku2SP7AiMahhimnoC * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/88024df121..430a742303 * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/2ad47493f8..e0658a4adf * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/37e562110f..87c8b91639 * src/third_party/espresso: c92dcfc4e894555a0b3c309f2b7939640eb1fee4..y8fIfH8Leo2cPm7iGCYnBxZpwOlgLv8rm2mlcmJlvGsC * src/third_party/ffmpeg: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/be66dc5fd0..23b2a15c25 * src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/62fea391fa..a443474755 * src/third_party/icu: https://chromium.googlesource.com/chromium/deps/icu.git/+log/630b884f84..79326efe26 * src/third_party/libaom/source/libaom: https://aomedia.googlesource.com/aom.git/+log/2aa13c436e..e1ebb418eb * src/third_party/libunwindstack: https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git/+log/046920fc49..11659d420a * src/third_party/libvpx/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/c176557314..769129fb29 * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/60cf022c02..44e38c4643 * src/third_party/r8: gobCh01BNwJNyLHHNFUmLWSMaAbe4x3izuzBFzxQpDoC..B467c9t23JiW_6XGqhvHvtEKWSkrPS2xG_gho_gbAI4C * src/third_party/turbine: 3UJ600difG3ThRhtYrN9AfZ5kh8wCYtBiii1-NMlCrMC..mr9FyghUYWLYv4L5Nr3C_oceLfmmybnFgAi366GjQoYC * src/third_party/turbine/src: https://chromium.googlesource.com/external/github.com/google/turbine.git/+log/95f6fb6f1e..1c98ea6854 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/050a4a5e26..d6998993f9 Added dependency * src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel_savedstate DEPS diff: https://chromium.googlesource.com/chromium/src/+/4d95e6c77b..71a0e1904e/DEPS Clang version changed f7f1abdb8893af4a606ca1a8f5347a426e9c7f9e:4e813bbdf Details: https://chromium.googlesource.com/chromium/src/+/4d95e6c77b..71a0e1904e/tools/clang/scripts/update.py TBR=chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com,marpan@webrtc.org, jianj@chromium.org, BUG=None Change-Id: Idb4a2ccc6eab502ecf78b34247a479ff5726b50a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178084 Reviewed-by: Jeremy Leconte <jleconte@google.com> Reviewed-by: Autoroller <chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#31569}
2020-06-25 22:57:49 +02:00
min_sdk_version = 21
Roll chromium_revision 6ae0f0cd4c..bf62d746a4 (669703:669828) + fix AndroidManifest In https://chromium-review.googlesource.com/1650265 attributes like minSdkVersion were moved from AndroidManifest.xml to GN files. For WebRTC there were a few problems with that. * We don't want to suppress UsesMinSdkAttributes lint but now there are these "invalid" manifest files that we can't exclude or discern. So disable this lint error. https://chromium-review.googlesource.com/c/chromium/src/+/1650265/14/build/android/AndroidManifest.xml * We should specify the versions in GN files, so I did that here (by exactly copying the versions that are already in the targets' corresponding XML files), but we never want to get rid of them in the XML files. For now this information will just be duplicated (without any synchronicity check!) so there should be followup to this. Change log: https://chromium.googlesource.com/chromium/src/+log/6ae0f0cd4c..bf62d746a4 Full diff: https://chromium.googlesource.com/chromium/src/+/6ae0f0cd4c..bf62d746a4 Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/9e5e9332df..e5a1d1f652 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/5a031748ec..2ef566e990 * src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/6ae683be2f..6f3775ad6e * src/buildtools/linux64: git_revision:8c7f49102234f4f4b9349dcb258554675475e596..git_revision:81ee1967d3fcbc829bac1c005c3da59739c88df9 * src/buildtools/mac: git_revision:8c7f49102234f4f4b9349dcb258554675475e596..git_revision:81ee1967d3fcbc829bac1c005c3da59739c88df9 * src/buildtools/win: git_revision:8c7f49102234f4f4b9349dcb258554675475e596..git_revision:81ee1967d3fcbc829bac1c005c3da59739c88df9 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/2f5c817266..7f1a97d593 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/1d4247de57..b1b36ff0d4 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/6f7cbf7c46..42e96c4074 * src/third_party/android_sdk/public: ki7EDQRAiZAUYlnTWR1XmI6cJTk65fJ-DNZUU1zrtS8C..xhyuoquVvBTcJelgRjMKZeoBVSQRjB7pLVJPt5C9saIC * src/third_party/android_sdk/public: iIwhhDox5E-mHgwUhCz8JACWQCpUjdqt5KTY9VLugKQC..ppQ4TnqDvBHQ3lXx5KPq97egzF5X2FFyOrVHkGmiTMQC * src/third_party/android_sdk/public: 4Y2Cb2LGzoc-qt-oIUIlhySotJaKeE3ELFedSVe6Uk8C..MSnxgXN7IurL-MQs1RrTkSFSb8Xd1UtZjLArI8Ty1FgC * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/ed9fcf3f70..9e5dbd8b46 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/f58f33bca1..a9a4b8fc7b DEPS diff: https://chromium.googlesource.com/chromium/src/+/6ae0f0cd4c..bf62d746a4/DEPS No update to Clang. Bug: chromium:891996 Change-Id: I773d6fa90e8083d934c84eecc1cb9d7d4496eca0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/142235 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Oleh Prypin <oprypin@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28311}
2019-06-18 17:09:51 +02:00
target_sdk_version = 24
deps = [
":NetworkTesterMobile_javalib",
":NetworkTesterMobile_resources",
"../../rtc_base:base_java",
]
shared_libraries = [ "../../rtc_tools/network_tester:network_tester_so" ]
}
Roll chromium_revision 6ae0f0cd4c..bf62d746a4 (669703:669828) + fix AndroidManifest In https://chromium-review.googlesource.com/1650265 attributes like minSdkVersion were moved from AndroidManifest.xml to GN files. For WebRTC there were a few problems with that. * We don't want to suppress UsesMinSdkAttributes lint but now there are these "invalid" manifest files that we can't exclude or discern. So disable this lint error. https://chromium-review.googlesource.com/c/chromium/src/+/1650265/14/build/android/AndroidManifest.xml * We should specify the versions in GN files, so I did that here (by exactly copying the versions that are already in the targets' corresponding XML files), but we never want to get rid of them in the XML files. For now this information will just be duplicated (without any synchronicity check!) so there should be followup to this. Change log: https://chromium.googlesource.com/chromium/src/+log/6ae0f0cd4c..bf62d746a4 Full diff: https://chromium.googlesource.com/chromium/src/+/6ae0f0cd4c..bf62d746a4 Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/9e5e9332df..e5a1d1f652 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/5a031748ec..2ef566e990 * src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/6ae683be2f..6f3775ad6e * src/buildtools/linux64: git_revision:8c7f49102234f4f4b9349dcb258554675475e596..git_revision:81ee1967d3fcbc829bac1c005c3da59739c88df9 * src/buildtools/mac: git_revision:8c7f49102234f4f4b9349dcb258554675475e596..git_revision:81ee1967d3fcbc829bac1c005c3da59739c88df9 * src/buildtools/win: git_revision:8c7f49102234f4f4b9349dcb258554675475e596..git_revision:81ee1967d3fcbc829bac1c005c3da59739c88df9 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/2f5c817266..7f1a97d593 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/1d4247de57..b1b36ff0d4 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/6f7cbf7c46..42e96c4074 * src/third_party/android_sdk/public: ki7EDQRAiZAUYlnTWR1XmI6cJTk65fJ-DNZUU1zrtS8C..xhyuoquVvBTcJelgRjMKZeoBVSQRjB7pLVJPt5C9saIC * src/third_party/android_sdk/public: iIwhhDox5E-mHgwUhCz8JACWQCpUjdqt5KTY9VLugKQC..ppQ4TnqDvBHQ3lXx5KPq97egzF5X2FFyOrVHkGmiTMQC * src/third_party/android_sdk/public: 4Y2Cb2LGzoc-qt-oIUIlhySotJaKeE3ELFedSVe6Uk8C..MSnxgXN7IurL-MQs1RrTkSFSb8Xd1UtZjLArI8Ty1FgC * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/ed9fcf3f70..9e5dbd8b46 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/f58f33bca1..a9a4b8fc7b DEPS diff: https://chromium.googlesource.com/chromium/src/+/6ae0f0cd4c..bf62d746a4/DEPS No update to Clang. Bug: chromium:891996 Change-Id: I773d6fa90e8083d934c84eecc1cb9d7d4496eca0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/142235 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Oleh Prypin <oprypin@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28311}
2019-06-18 17:09:51 +02:00
rtc_android_library("NetworkTesterMobile_javalib") {
testonly = true
android_manifest = "androidapp/AndroidManifest.xml"
sources = [
"androidapp/src/com/google/media/networktester/MainActivity.java",
"androidapp/src/com/google/media/networktester/NetworkTester.java",
]
resources_package = "com.google.media.networktester"
deps = [
":NetworkTesterMobile_resources",
"../../rtc_base:base_java",
]
}
android_resources("NetworkTesterMobile_resources") {
testonly = true
custom_package = "com.google.media.networktester"
sources = [
"androidapp/res/layout/activity_main.xml",
"androidapp/res/mipmap-hdpi/ic_launcher.png",
"androidapp/res/mipmap-mdpi/ic_launcher.png",
"androidapp/res/mipmap-xhdpi/ic_launcher.png",
"androidapp/res/mipmap-xxhdpi/ic_launcher.png",
"androidapp/res/mipmap-xxxhdpi/ic_launcher.png",
"androidapp/res/values-v17/styles.xml",
"androidapp/res/values-w820dp/dimens.xml",
"androidapp/res/values/colors.xml",
"androidapp/res/values/dimens.xml",
"androidapp/res/values/strings.xml",
]
# Needed for Bazel converter.
resource_dirs = [ "androidapp/res" ]
assert(resource_dirs != []) # Mark as used.
}
rtc_shared_library("network_tester_so") {
sources = [ "jni.cc" ]
deps = [
":network_tester",
"../../rtc_base:logging",
"../../rtc_base:threading",
]
suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ]
configs += [ "//build/config/android:hide_all_but_jni" ]
output_extension = "so"
}
}