diff --git a/DEPS b/DEPS index 717f9571b8..01e096285b 100644 --- a/DEPS +++ b/DEPS @@ -8,37 +8,37 @@ vars = { # chromium waterfalls. More info at: crbug.com/570091. 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', - 'chromium_revision': '4d95e6c77b6c37d8ea56bb81f14cb9c12a1cc1a3', + 'chromium_revision': '71a0e1904e88451c64d46ae08e3f8cbdf4d5516e', } deps = { # TODO(kjellander): Move this to be Android-only once the libevent dependency # in base/third_party/libevent is solved. 'src/base': - 'https://chromium.googlesource.com/chromium/src/base@2df7267880bf7d4086d55c0e56cd72c394bfda36', + 'https://chromium.googlesource.com/chromium/src/base@736d9fb42c2399551cfe23f025f5e99530aea1a1', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@a03951acb996e9cea78b4ab575896bf1bfcd9668', + 'https://chromium.googlesource.com/chromium/src/build@ceecd92e25abdf9d8f83e9d41252e3970cb02169', 'src/buildtools': - 'https://chromium.googlesource.com/chromium/src/buildtools@1b066f021638735d72aa799ae6bc37e0b8963c67', + 'https://chromium.googlesource.com/chromium/src/buildtools@1ed99573d57d4b6041261b531cdf876e631cf0bc', # Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC. 'src/examples/androidtests/third_party/gradle': { 'url': 'https://chromium.googlesource.com/external/github.com/gradle/gradle.git@89af43c4d0506f69980f00dde78c97b2f81437f8', 'condition': 'checkout_android', }, 'src/ios': { - 'url': 'https://chromium.googlesource.com/chromium/src/ios@9200aad36b240166dcf8d771b95102f8193e737f', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@73c8bcb1b1964a20e95315440549f0ab62da4fd5', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@502600d41a00af23dd09e02ea358061e3c951634', + 'https://chromium.googlesource.com/chromium/src/testing@77ba7104d5d19121181a4409f78ec1825f33828f', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@e0df6e10adc084f88dda51c0cbab84645db6c135', + 'https://chromium.googlesource.com/chromium/src/third_party@1908162da77ee31984c59c91e502b11fe34ec55d', 'src/buildtools/linux64': { 'packages': [ { 'package': 'gn/gn/linux-amd64', - 'version': 'git_revision:d0a6f072070988e7b038496c4e7d6c562b649732', + 'version': 'git_revision:7d7e8deea36d126397bda2cf924682504271f0e1', } ], 'dep_type': 'cipd', @@ -48,7 +48,7 @@ deps = { 'packages': [ { 'package': 'gn/gn/mac-amd64', - 'version': 'git_revision:d0a6f072070988e7b038496c4e7d6c562b649732', + 'version': 'git_revision:7d7e8deea36d126397bda2cf924682504271f0e1', } ], 'dep_type': 'cipd', @@ -58,7 +58,7 @@ deps = { 'packages': [ { 'package': 'gn/gn/windows-amd64', - 'version': 'git_revision:d0a6f072070988e7b038496c4e7d6c562b649732', + 'version': 'git_revision:7d7e8deea36d126397bda2cf924682504271f0e1', } ], 'dep_type': 'cipd', @@ -119,20 +119,20 @@ deps = { }, 'src/third_party/boringssl/src': - 'https://boringssl.googlesource.com/boringssl.git@88024df12147e56b6abd66b743ff441a0aaa09a8', + 'https://boringssl.googlesource.com/boringssl.git@430a7423039682e4bbc7b522e3b57b2c8dca5e3b', 'src/third_party/breakpad/breakpad': 'https://chromium.googlesource.com/breakpad/breakpad.git@2757a2c9c819fcae3784576aef0c8400c7ad06d7', 'src/third_party/catapult': - 'https://chromium.googlesource.com/catapult.git@2ad47493f833c5191f56c74d3f1aac10e7c105e8', + 'https://chromium.googlesource.com/catapult.git@e0658a4adf1247bd20ab047b7dc95fa9b9efb96b', 'src/third_party/ced/src': { 'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5', }, 'src/third_party/colorama/src': 'https://chromium.googlesource.com/external/colorama.git@799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/depot_tools': - 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@37e562110fa58a913b13ed2258f18449f90c6ad7', + 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@87c8b91639837bc8518cdbe4842484633cf60b6e', 'src/third_party/ffmpeg': - 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@be66dc5fd0e3c53646107b2dc5d7594a869ebdc6', + 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@23b2a15c2595925c8ec0d3be9a51ec3257281bd1', 'src/third_party/findbugs': { 'url': 'https://chromium.googlesource.com/chromium/deps/findbugs.git@4275d9ac8610db6b1bc9a5e887f97e41b33fac67', 'condition': 'checkout_android', @@ -143,7 +143,7 @@ deps = { 'condition': 'checkout_linux', }, 'src/third_party/freetype/src': - 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@62fea391fa9993f8c1d206a50080d690178ce518', + 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@a4434747558d872c55e55ce428019a8e15d222dc', 'src/third_party/harfbuzz-ng/src': 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@e3af529e511ca492284cdd9f4584666b88a9e00f', 'src/third_party/google_benchmark/src': { @@ -165,7 +165,7 @@ deps = { 'src/third_party/googletest/src': 'https://chromium.googlesource.com/external/github.com/google/googletest.git@4fe018038f87675c083d0cfb6a6b57c274fb1753', 'src/third_party/icu': { - 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@630b884f84d1d5e92aeda3463dca99fe2befd30e', + 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@79326efe26e5440f530963704c3c0ff965b3a4ac', }, 'src/third_party/jdk': { 'packages': [ @@ -195,15 +195,15 @@ deps = { 'src/third_party/libsrtp': 'https://chromium.googlesource.com/chromium/deps/libsrtp.git@650611720ecc23e0e6b32b0e3100f8b4df91696c', 'src/third_party/libaom/source/libaom': - 'https://aomedia.googlesource.com/aom.git@2aa13c436e4dc6d78e05d13e6be73a23b3810bd3', + 'https://aomedia.googlesource.com/aom.git@e1ebb418ebdcc5202ed6a3bea38547fd6ed4b7ca', 'src/third_party/libunwindstack': { - 'url': 'https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git@046920fc491aba67c6f6a750b4be7b835cff4e5b', + 'url': 'https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git@11659d420a71e7323b379ea8781f07c6f384bc7e', 'condition': 'checkout_android', }, 'src/third_party/perfetto': - 'https://android.googlesource.com/platform/external/perfetto.git@60cf022c0223b4c28424509dca35e347872c4832', + 'https://android.googlesource.com/platform/external/perfetto.git@44e38c4643cebae45fe9c4d32fd8a2b4dd708262', 'src/third_party/libvpx/source/libvpx': - 'https://chromium.googlesource.com/webm/libvpx.git@c1765573149e2c0fe2acabc224c0f9085b9e7f2b', + 'https://chromium.googlesource.com/webm/libvpx.git@769129fb29fc66720be2b01276a472c334757d2d', 'src/third_party/libyuv': 'https://chromium.googlesource.com/libyuv/libyuv.git@6afd9becdf58822b1da6770598d8597c583ccfad', 'src/third_party/lss': { @@ -226,7 +226,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': 'gobCh01BNwJNyLHHNFUmLWSMaAbe4x3izuzBFzxQpDoC', + 'version': 'B467c9t23JiW_6XGqhvHvtEKWSkrPS2xG_gho_gbAI4C', }, ], 'condition': 'checkout_android', @@ -258,7 +258,7 @@ deps = { 'condition': 'checkout_win', }, 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@050a4a5e267e98c79fe632d84bbc2fbaa4d22fd4', + 'https://chromium.googlesource.com/chromium/src/tools@d6998993f922de013a4f299d53afda745d13319e', 'src/tools/swarming_client': 'https://chromium.googlesource.com/infra/luci/client-py.git@4c095d04179dc725a300085ae21fe3b79900d072', @@ -332,7 +332,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/espresso', - 'version': 'c92dcfc4e894555a0b3c309f2b7939640eb1fee4', + 'version': 'y8fIfH8Leo2cPm7iGCYnBxZpwOlgLv8rm2mlcmJlvGsC', }, ], 'condition': 'checkout_android', @@ -398,7 +398,7 @@ deps = { }, { 'package': 'chromium/third_party/android_sdk/public/cmdline-tools', - 'version': 'CR25ixsRhwuRnhdgDpGFyl9S0C_0HO9SUgFrwX46zq8C', + 'version': 'uM0XtAW9BHh8phcbhBDA9GfzP3bku2SP7AiMahhimnoC', }, ], 'condition': 'checkout_android', @@ -464,7 +464,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/turbine', - 'version': '3UJ600difG3ThRhtYrN9AfZ5kh8wCYtBiii1-NMlCrMC', + 'version': 'mr9FyghUYWLYv4L5Nr3C_oceLfmmybnFgAi366GjQoYC', }, ], 'condition': 'checkout_android', @@ -472,7 +472,7 @@ deps = { }, 'src/third_party/turbine/src': { - 'url': 'https://chromium.googlesource.com/external/github.com/google/turbine.git' + '@' + '95f6fb6f1e962e8b6ec672905b0b04233f002dc2', + 'url': 'https://chromium.googlesource.com/external/github.com/google/turbine.git' + '@' + '1c98ea68543162a33c89c3629ed29c2c46391b7b', 'condition': 'checkout_android', }, @@ -600,7 +600,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_activity_activity', - 'version': 'version:1.0.0-cr0', + 'version': 'version:1.1.0-cr0', }, ], 'condition': 'checkout_android', @@ -666,7 +666,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_arch_core_core_runtime', - 'version': 'version:2.0.0-cr0', + 'version': 'version:2.1.0-cr0', }, ], 'condition': 'checkout_android', @@ -787,7 +787,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_fragment_fragment', - 'version': 'version:1.1.0-cr0', + 'version': 'version:1.2.5-cr0', }, ], 'condition': 'checkout_android', @@ -897,7 +897,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common', - 'version': 'version:2.1.0-cr0', + 'version': 'version:2.2.0-cr0', }, ], 'condition': 'checkout_android', @@ -930,7 +930,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata_core', - 'version': 'version:2.0.0-cr0', + 'version': 'version:2.2.0-cr0', }, ], 'condition': 'checkout_android', @@ -941,7 +941,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_runtime', - 'version': 'version:2.1.0-cr0', + 'version': 'version:2.2.0-cr0', }, ], 'condition': 'checkout_android', @@ -952,7 +952,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel', - 'version': 'version:2.1.0-cr0', + 'version': 'version:2.2.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel_savedstate': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel_savedstate', + 'version': 'version:2.2.0-cr0', }, ], 'condition': 'checkout_android', @@ -1029,7 +1040,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_preference_preference', - 'version': 'version:1.0.0-cr0', + 'version': 'version:1.1.1-cr0', }, ], 'condition': 'checkout_android', @@ -2932,7 +2943,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_multidex', - 'version': 'version:4.3.1-cr0', + 'version': 'version:4.3.1-cr1', }, ], 'condition': 'checkout_android', diff --git a/build_overrides/build.gni b/build_overrides/build.gni index 01eb9a0b2d..32d04d065b 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni @@ -46,3 +46,10 @@ if (host_os == "mac") { "hermetic toolchain if the minimum OS version is not met.") use_system_xcode = _result == 0 } + +declare_args() { + # WebRTC doesn't depend on //base from production code but only for testing + # purposes. In any case, it doesn't depend on //third_party/perfetto which + # is used for base tracing, so this feature is disabled. + enable_base_tracing = false +} diff --git a/examples/BUILD.gn b/examples/BUILD.gn index ab3d5edfc9..11cf934011 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -87,7 +87,7 @@ if (is_android) { testonly = true apk_name = "AppRTCMobile" android_manifest = "androidapp/AndroidManifest.xml" - min_sdk_version = 16 + min_sdk_version = 21 target_sdk_version = 29 deps = [ @@ -196,7 +196,7 @@ if (is_android) { rtc_instrumentation_test_apk("AppRTCMobile_test_apk") { apk_name = "AppRTCMobileTest" android_manifest = "androidtests/AndroidManifest.xml" - min_sdk_version = 16 + min_sdk_version = 21 target_sdk_version = 21 sources = [ diff --git a/examples/aarproject/app/build.gradle b/examples/aarproject/app/build.gradle index dde0707ace..37499d468b 100644 --- a/examples/aarproject/app/build.gradle +++ b/examples/aarproject/app/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion "27.0.1" defaultConfig { applicationId "org.appspot.apprtc" - minSdkVersion 16 + minSdkVersion 21 targetSdkVersion 21 versionCode 1 versionName "1.0" diff --git a/examples/androidapp/AndroidManifest.xml b/examples/androidapp/AndroidManifest.xml index 8a9035e782..c4e1e797d0 100644 --- a/examples/androidapp/AndroidManifest.xml +++ b/examples/androidapp/AndroidManifest.xml @@ -8,7 +8,7 @@ - + diff --git a/examples/androidnativeapi/AndroidManifest.xml b/examples/androidnativeapi/AndroidManifest.xml index f10f55a1b6..9257c4132e 100644 --- a/examples/androidnativeapi/AndroidManifest.xml +++ b/examples/androidnativeapi/AndroidManifest.xml @@ -2,7 +2,7 @@ - + diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn index 2b2c71b9e8..7dd5789ab2 100644 --- a/examples/androidnativeapi/BUILD.gn +++ b/examples/androidnativeapi/BUILD.gn @@ -5,7 +5,7 @@ if (is_android) { testonly = true apk_name = "androidnativeapi" android_manifest = "AndroidManifest.xml" - min_sdk_version = 19 + min_sdk_version = 21 target_sdk_version = 27 sources = [ diff --git a/examples/androidtests/AndroidManifest.xml b/examples/androidtests/AndroidManifest.xml index dae2e980a6..8e995366dc 100644 --- a/examples/androidtests/AndroidManifest.xml +++ b/examples/androidtests/AndroidManifest.xml @@ -14,7 +14,7 @@ package="org.appspot.apprtc.test"> - + diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn index 1156bf5dd8..ee743309fa 100644 --- a/rtc_tools/network_tester/BUILD.gn +++ b/rtc_tools/network_tester/BUILD.gn @@ -101,7 +101,7 @@ if (is_android) { testonly = true apk_name = "NetworkTesterMobile" android_manifest = "androidapp/AndroidManifest.xml" - min_sdk_version = 16 + min_sdk_version = 21 target_sdk_version = 24 deps = [ diff --git a/rtc_tools/network_tester/androidapp/AndroidManifest.xml b/rtc_tools/network_tester/androidapp/AndroidManifest.xml index 3839955458..1ff519396b 100755 --- a/rtc_tools/network_tester/androidapp/AndroidManifest.xml +++ b/rtc_tools/network_tester/androidapp/AndroidManifest.xml @@ -4,7 +4,7 @@ - - + diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index 3c824dbe75..7ea110db8e 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -1306,7 +1306,7 @@ if (is_android) { rtc_instrumentation_test_apk("android_instrumentation_test_apk") { apk_name = "android_instrumentation_test_apk" android_manifest = "instrumentationtests/AndroidManifest.xml" - min_sdk_version = 16 + min_sdk_version = 21 target_sdk_version = 21 sources = [ diff --git a/sdk/android/instrumentationtests/AndroidManifest.xml b/sdk/android/instrumentationtests/AndroidManifest.xml index 75df968f13..55028da703 100644 --- a/sdk/android/instrumentationtests/AndroidManifest.xml +++ b/sdk/android/instrumentationtests/AndroidManifest.xml @@ -16,7 +16,7 @@ - + diff --git a/sdk/android/tests/resources/robolectric.properties b/sdk/android/tests/resources/robolectric.properties index 3acb7e5d59..a9bc625b18 100644 --- a/sdk/android/tests/resources/robolectric.properties +++ b/sdk/android/tests/resources/robolectric.properties @@ -1 +1 @@ -sdk=19,21,25,26 +sdk=21,25,26 diff --git a/test/android/AndroidManifest.xml b/test/android/AndroidManifest.xml index c1ddfd4a02..ee2fec8716 100644 --- a/test/android/AndroidManifest.xml +++ b/test/android/AndroidManifest.xml @@ -14,7 +14,7 @@ be found in the AUTHORS file in the root of the source tree. android:versionCode="1" android:versionName="1.0"> - + diff --git a/tools_webrtc/msan/blacklist.txt b/tools_webrtc/msan/blacklist.txt index 3c9c9b202b..ce8b14292e 100644 --- a/tools_webrtc/msan/blacklist.txt +++ b/tools_webrtc/msan/blacklist.txt @@ -10,3 +10,6 @@ # Uninit in zlib. http://crbug.com/116277 fun:*MOZ_Z_deflate* +# Uninit in H264. http://crbug.com/webrtc/11702 +src:*/third_party/openh264/src/codec/processing/src/vaacalc/vaacalcfuncs.cpp + diff --git a/webrtc.gni b/webrtc.gni index 680762f3a1..7cf81e6af4 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -438,7 +438,7 @@ template("rtc_test") { } if (!build_with_chromium && is_android) { android_manifest = webrtc_root + "test/android/AndroidManifest.xml" - min_sdk_version = 16 + min_sdk_version = 21 deps += [ webrtc_root + "test:native_test_java" ] } }