Roll chromium_revision fd0452ac3a..49983e8c01 (1242677:1242712)
Change log: https://chromium.googlesource.com/chromium/src/+log/fd0452ac3a..49983e8c01
Full diff: https://chromium.googlesource.com/chromium/src/+/fd0452ac3a..49983e8c01
Changed dependencies
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/61c7041d9f..566a1bd097
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/9eafcc3b22..5d325c28aa
* src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/d012611f35..68c88f4ea9
* src/third_party/android_build_tools/manifest_merger: SsLJuePpgSRlofU-tTKtZM6uoAelYZV8509WbBDI-ecC..WTmajghAylCsg6DjtBSRd1dHKUjkkeex-9ASgLJ0cu8C
* src/third_party/androidx: iH0Wh-bfEVnC01NIkBa7J6LWO35OT6leWNTqP1PKJ6sC..fxep2qUxHMuSadHbR8ufKuYVmB9SKknNkkBDLneqqhwC
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/6d3a4756c7..65730c4295
* src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/0e40b92d9e..259976c748
* src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/ca76683b78..a07ca46cd0
* src/third_party/libaom/source/libaom: https://aomedia.googlesource.com/aom.git/+log/4f632e5b6d..0eeb62d344
* src/third_party/libc++abi/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/8806fb8bb2..7451ba4b85
* src/third_party/nasm: https://chromium.googlesource.com/chromium/deps/nasm.git/+log/7fc833e889..f477acb104
* src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/2d7122e93a..805d611c93
* src/third_party/r8: jhySaAcbymFyscnhmoW9tqZ4z0tvqR-bR48EzVILKq0C..Deex61FDXcnUcwzjKHy_-EIsIgHjWot2d7dcvIsk3BQC
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/9db0dc9c4a..1be790cb8e
* src/tools/luci-go: git_revision:0ffd60c8bd4fa542fb8d7c6a60ead9b96dc4387a..git_revision:a7b7f319032d68f1cf0e710e695a84957d3b11dc
* src/tools/luci-go: git_revision:0ffd60c8bd4fa542fb8d7c6a60ead9b96dc4387a..git_revision:a7b7f319032d68f1cf0e710e695a84957d3b11dc
DEPS diff: https://chromium.googlesource.com/chromium/src/+/fd0452ac3a..49983e8c01/DEPS
No update to Clang.
BUG=None
Change-Id: I68e07a600dac4cddaec50bc6489b3790127f5582
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/333401
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41481}
diff --git a/DEPS b/DEPS
index 42d04b8..18a827f 100644
--- a/DEPS
+++ b/DEPS
@@ -10,7 +10,7 @@
# chromium waterfalls. More info at: crbug.com/570091.
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
- 'chromium_revision': '5bad326c9844df90aa35c49edd3e8005869128a4',
+ 'chromium_revision': '49983e8c0142d92f596489a8906c1c20631a5a07',
# Fetch the prebuilt binaries for llvm-cov and llvm-profdata. Needed to
# process the raw profiles produced by instrumented targets (built with
@@ -50,9 +50,9 @@
deps = {
# TODO(kjellander): Move this to be Android-only.
'src/base':
- 'https://chromium.googlesource.com/chromium/src/base@e1edecd3cbd1c6ee11d77093b344e54304eaf33d',
+ 'https://chromium.googlesource.com/chromium/src/base@1a6ee27f964d97882c10d1ea190e3440d3654369',
'src/build':
- 'https://chromium.googlesource.com/chromium/src/build@758a805edf32c962269881464d4c24a925328263',
+ 'https://chromium.googlesource.com/chromium/src/build@b4c3d1df5f637cb4be2e8bc16436f33a35a2e5b0',
'src/buildtools':
'https://chromium.googlesource.com/chromium/src/buildtools@5e016b7d32822a0cbc3c65162aa9fc2bd021f275',
# Gradle 6.6.1. Used for testing Android Studio project generation for WebRTC.
@@ -61,13 +61,13 @@
'condition': 'checkout_android',
},
'src/ios': {
- 'url': 'https://chromium.googlesource.com/chromium/src/ios@61c7041d9f8288b6b038ee104f534657f371b8a0',
+ 'url': 'https://chromium.googlesource.com/chromium/src/ios@566a1bd097250406c592318b7af13e37e18df57c',
'condition': 'checkout_ios',
},
'src/testing':
- 'https://chromium.googlesource.com/chromium/src/testing@9eafcc3b22f16cd443b49d7286726cd02a7454ab',
+ 'https://chromium.googlesource.com/chromium/src/testing@5d325c28aa58108b547b11ca9204e5b70b03f31d',
'src/third_party':
- 'https://chromium.googlesource.com/chromium/src/third_party@d012611f35c8668178802c909985d37bc6c9b212',
+ 'https://chromium.googlesource.com/chromium/src/third_party@68c88f4ea9357022d240188017e8c8930bed5791',
'src/buildtools/linux64': {
'packages': [
@@ -117,7 +117,7 @@
'src/third_party/libc++/src':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@15db46be4ec5e2c31a35bf07357b5025e2754693',
'src/third_party/libc++abi/src':
- 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@8806fb8bb26e20206241ea2dfcee4fd2d4157b83',
+ 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@7451ba4b852aa031667d0331b7fd13afabd6b232',
'src/third_party/libunwind/src':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@2602aecdf4bfa2a4bd70722937b2ec503d8c46c8',
@@ -189,7 +189,7 @@
'src/third_party/breakpad/breakpad':
'https://chromium.googlesource.com/breakpad/breakpad.git@f49c2f1a2023da0cb055874fba050563dfea57db',
'src/third_party/catapult':
- 'https://chromium.googlesource.com/catapult.git@6d3a4756c7dc87928f11c01e4fcd5675e17c64f3',
+ 'https://chromium.googlesource.com/catapult.git@65730c4295c0bcd15c0e817d7f8a1566c6342211',
'src/third_party/ced/src': {
'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5',
},
@@ -202,7 +202,7 @@
'src/third_party/crc32c/src':
'https://chromium.googlesource.com/external/github.com/google/crc32c.git@fa5ade41ee480003d9c5af6f43567ba22e4e17e6',
'src/third_party/depot_tools':
- 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@0e40b92d9ec7f75c76a831b72ad1842efa830275',
+ 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@259976c7483c321c122169d193e150310f4ea609',
'src/third_party/ffmpeg':
'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@17525de887d54b970ffdd421a0879c1db1952307',
'src/third_party/flatbuffers/src':
@@ -216,7 +216,7 @@
'condition': 'checkout_linux',
},
'src/third_party/freetype/src':
- 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@ca76683b781db5d06ef1a0e2cb62a767e7dbe626',
+ 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@a07ca46cd0fcb4af99ae831dee803d3bddf01dd6',
'src/third_party/harfbuzz-ng/src':
'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@920c40cd43dd7b10b7ecba3d82a46f5fea88536f',
'src/third_party/google_benchmark/src': {
@@ -296,13 +296,13 @@
'src/third_party/dav1d/libdav1d':
'https://chromium.googlesource.com/external/github.com/videolan/dav1d.git@47107e384bd1dc25674acf04d000a8cdc6195234',
'src/third_party/libaom/source/libaom':
- 'https://aomedia.googlesource.com/aom.git@4f632e5b6d1c3cce0bbbc0f2c030171082fc1b3e',
+ 'https://aomedia.googlesource.com/aom.git@0eeb62d344b2ffabfc238813b43c677755a63c29',
'src/third_party/libunwindstack': {
'url': 'https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git@4dbfa0e8c844c8e243b297bc185e54a99ff94f9e',
'condition': 'checkout_android',
},
'src/third_party/perfetto':
- 'https://android.googlesource.com/platform/external/perfetto.git@2d7122e93a9780b9c9c68a2ef8bfbdb46c38db7c',
+ 'https://android.googlesource.com/platform/external/perfetto.git@805d611c93590352f8b31108e07ddcc5d2ecd4f8',
'src/third_party/libvpx/source/libvpx':
'https://chromium.googlesource.com/webm/libvpx.git@df655cf4fb6c2a23b964544acd015cc715752830',
'src/third_party/libyuv':
@@ -318,7 +318,7 @@
# Used by boringssl.
'src/third_party/nasm': {
- 'url': 'https://chromium.googlesource.com/chromium/deps/nasm.git@7fc833e889d1afda72c06220e5bed8fb43b2e5ce'
+ 'url': 'https://chromium.googlesource.com/chromium/deps/nasm.git@f477acb1049f5e043904b87b825c5915084a9a29'
},
'src/third_party/openh264/src':
@@ -331,7 +331,7 @@
'packages': [
{
'package': 'chromium/third_party/r8',
- 'version': 'jhySaAcbymFyscnhmoW9tqZ4z0tvqR-bR48EzVILKq0C',
+ 'version': 'Deex61FDXcnUcwzjKHy_-EIsIgHjWot2d7dcvIsk3BQC',
},
],
'condition': 'checkout_android',
@@ -355,7 +355,7 @@
'condition': 'checkout_android',
},
'src/tools':
- 'https://chromium.googlesource.com/chromium/src/tools@9db0dc9c4a0c1f48e34159906d65d26c823c454c',
+ 'https://chromium.googlesource.com/chromium/src/tools@1be790cb8e9bc832834848c3aea096ba080a14b4',
'src/third_party/accessibility_test_framework': {
'packages': [
@@ -405,7 +405,7 @@
'packages': [
{
'package': 'chromium/third_party/androidx',
- 'version': 'iH0Wh-bfEVnC01NIkBa7J6LWO35OT6leWNTqP1PKJ6sC',
+ 'version': 'fxep2qUxHMuSadHbR8ufKuYVmB9SKknNkkBDLneqqhwC',
},
],
'condition': 'checkout_android',
@@ -416,7 +416,7 @@
'packages': [
{
'package': 'chromium/third_party/android_build_tools/manifest_merger',
- 'version': 'SsLJuePpgSRlofU-tTKtZM6uoAelYZV8509WbBDI-ecC',
+ 'version': 'WTmajghAylCsg6DjtBSRd1dHKUjkkeex-9ASgLJ0cu8C',
},
],
'condition': 'checkout_android',
@@ -509,11 +509,11 @@
'packages': [
{
'package': 'infra/tools/luci/isolate/${{platform}}',
- 'version': 'git_revision:0ffd60c8bd4fa542fb8d7c6a60ead9b96dc4387a',
+ 'version': 'git_revision:a7b7f319032d68f1cf0e710e695a84957d3b11dc',
},
{
'package': 'infra/tools/luci/swarming/${{platform}}',
- 'version': 'git_revision:0ffd60c8bd4fa542fb8d7c6a60ead9b96dc4387a',
+ 'version': 'git_revision:a7b7f319032d68f1cf0e710e695a84957d3b11dc',
},
],
'dep_type': 'cipd',
diff --git a/sdk/android/src/jni/jni_generator_helper.h b/sdk/android/src/jni/jni_generator_helper.h
index 17b5764..2d478e0 100644
--- a/sdk/android/src/jni/jni_generator_helper.h
+++ b/sdk/android/src/jni/jni_generator_helper.h
@@ -90,7 +90,7 @@
} // namespace android
} // namespace base
-namespace jni_generator {
+namespace jni_zero {
inline void CheckException(JNIEnv* env) {
CHECK_EXCEPTION(env);
}
@@ -156,7 +156,7 @@
base.pc = reinterpret_cast<uintptr_t>(__builtin_return_address(0));
}
- ~JniJavaCallContextChecked() { jni_generator::CheckException(base.env1); }
+ ~JniJavaCallContextChecked() { jni_zero::CheckException(base.env1); }
JniJavaCallContextUnchecked base;
};
@@ -164,6 +164,14 @@
static_assert(sizeof(JniJavaCallContextChecked) ==
sizeof(JniJavaCallContextUnchecked),
"Stack unwinder cannot work with structs of different sizes.");
+} // namespace jni_zero
+
+// Re-export helpers in the old jni_generator namespace.
+// TODO(b/319078685): Remove once all uses of the jni_generator has been
+// updated.
+namespace jni_generator {
+using jni_zero::JniJavaCallContextChecked;
+using jni_zero::JniJavaCallContextUnchecked;
} // namespace jni_generator
#endif // SDK_ANDROID_SRC_JNI_JNI_GENERATOR_HELPER_H_
