Roll chromium_revision 10080947c0..6b95b8aa08 (1174188:1175249)
Change log: https://chromium.googlesource.com/chromium/src/+log/10080947c0..6b95b8aa08
Full diff: https://chromium.googlesource.com/chromium/src/+/10080947c0..6b95b8aa08
Changed dependencies
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/3de7d110cb..dcfe245ca1
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/3dd34519f9..b74cdc4550
* src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/ca163845c7..16be42a9ff
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/a265a85ace..51a637843f
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/85b0f51488..b946312a89
* src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/53a08ec089..93b5f4c408
* src/third_party/android_build_tools/manifest_merger: UwtCH6usmvLSrqbzGSTrjqJ1AJnNh-Vkq4hCEKvDM5oC..8fr-1Vf_pfxN9ulzWVaZvIXggDgWDs-0dtlGA1Sue48C
* src/third_party/androidx: ZIfpMhRlZ2Wm-GCtxgdXmEUojZK4r6xCyO7sLg51fjgC..y7rF_rx56mD3FGhMiqnlbQ6HOqHJ95xUFNX1m-_a988C
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/b119dc414e..84e3795d98
* src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/d411904b84..54e86436a8
* src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/5769f13a6b..9e3c5d7e18
* src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/e568f2855d..ab16995d92
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/1a0f13f46a..4057b98943
DEPS diff: https://chromium.googlesource.com/chromium/src/+/10080947c0..6b95b8aa08/DEPS
No update to Clang.
BUG=b/293234089
Change-Id: I84b9c8309208b0bb3cb492ac5a8952c48ede0c6f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/313200
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Christoffer Jansson <jansson@webrtc.org>
Owners-Override: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40520}
diff --git a/DEPS b/DEPS
index 318a401..6c1c211 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': '10080947c059bf3b8230134d9a5c38edb21c098a',
+ 'chromium_revision': '6b95b8aa08c9d0a1529f49dcdb2b17afe36a0ca5',
# Fetch the prebuilt binaries for llvm-cov and llvm-profdata. Needed to
# process the raw profiles produced by instrumented targets (built with
@@ -50,24 +50,24 @@
deps = {
# TODO(kjellander): Move this to be Android-only.
'src/base':
- 'https://chromium.googlesource.com/chromium/src/base@3de7d110cbd179a0698db9cdde49a787fd023393',
+ 'https://chromium.googlesource.com/chromium/src/base@dcfe245ca1e349e0f71279dc975e02b6676ce0be',
'src/build':
- 'https://chromium.googlesource.com/chromium/src/build@3dd34519f96ccb4b93cbb45869d74aad0d1d1175',
+ 'https://chromium.googlesource.com/chromium/src/build@b74cdc4550c2d21b53fd73bb5f5cec13466454a2',
'src/buildtools':
- 'https://chromium.googlesource.com/chromium/src/buildtools@ca163845c76db63454f99436f6cd2bf03739dc24',
+ 'https://chromium.googlesource.com/chromium/src/buildtools@16be42a9ff1f7e4a3e53b93b3adc181fa7ff9161',
# Gradle 6.6.1. 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@f2d1fb54a951d8b11d25748e4711bec8d128d7e3',
'condition': 'checkout_android',
},
'src/ios': {
- 'url': 'https://chromium.googlesource.com/chromium/src/ios@a265a85ace71d2a2238a8fdfbc941a733fc58b89',
+ 'url': 'https://chromium.googlesource.com/chromium/src/ios@51a637843f008fc981cf7f6401cbddc5a59aa59c',
'condition': 'checkout_ios',
},
'src/testing':
- 'https://chromium.googlesource.com/chromium/src/testing@85b0f5148862380f7a99523186184543cbda16b9',
+ 'https://chromium.googlesource.com/chromium/src/testing@b946312a8903933cd21deb8e3a8dae4275391dda',
'src/third_party':
- 'https://chromium.googlesource.com/chromium/src/third_party@53a08ec0898a59f6daa827956e6f062adeebf377',
+ 'https://chromium.googlesource.com/chromium/src/third_party@93b5f4c4085cdef6b3d742153ab934aa0c7c46df',
'src/buildtools/linux64': {
'packages': [
@@ -178,7 +178,7 @@
'src/third_party/breakpad/breakpad':
'https://chromium.googlesource.com/breakpad/breakpad.git@8988364bcddd9b194b0bf931c10bc125987330ed',
'src/third_party/catapult':
- 'https://chromium.googlesource.com/catapult.git@b119dc414e34f9b572f778244fdafccc53ede286',
+ 'https://chromium.googlesource.com/catapult.git@84e3795d98335b636d0be626b1833026a5c6d60b',
'src/third_party/ced/src': {
'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5',
},
@@ -191,7 +191,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@d411904b84c0d9f539bbdc84e3d63f9f282c658b',
+ 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@54e86436a88ed946752b818769fb74ba9938603b',
'src/third_party/ffmpeg':
'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@881c5c3f6412020c37e97e178e0f5da9ddd2ae90',
'src/third_party/flatbuffers/src':
@@ -205,7 +205,7 @@
'condition': 'checkout_linux',
},
'src/third_party/freetype/src':
- 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@5769f13a6b9fafa3840726f06dde07e755501a16',
+ 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@9e3c5d7e183c1a8d5ed8868d7d28ef18d3ec9ec8',
'src/third_party/harfbuzz-ng/src':
'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@db700b5670d9475cc8ed4880cc9447b232c5e432',
'src/third_party/google_benchmark/src': {
@@ -295,7 +295,7 @@
'condition': 'checkout_android',
},
'src/third_party/perfetto':
- 'https://android.googlesource.com/platform/external/perfetto.git@e568f2855db90f55ed521292b2c33accad68fb06',
+ 'https://android.googlesource.com/platform/external/perfetto.git@ab16995d92ae1354633b3025682bc34c29411c20',
'src/third_party/libvpx/source/libvpx':
'https://chromium.googlesource.com/webm/libvpx.git@9ad950a9c4f8906fcdabb3402db1a17a9d99ee4c',
'src/third_party/libyuv':
@@ -344,7 +344,7 @@
'condition': 'checkout_android',
},
'src/tools':
- 'https://chromium.googlesource.com/chromium/src/tools@1a0f13f46a590d5b50838121851e820dd5a9ccdf',
+ 'https://chromium.googlesource.com/chromium/src/tools@4057b98943f73331c3198b46f860533ecd692585',
'src/third_party/accessibility_test_framework': {
'packages': [
@@ -416,7 +416,7 @@
'packages': [
{
'package': 'chromium/third_party/androidx',
- 'version': 'ZIfpMhRlZ2Wm-GCtxgdXmEUojZK4r6xCyO7sLg51fjgC',
+ 'version': 'y7rF_rx56mD3FGhMiqnlbQ6HOqHJ95xUFNX1m-_a988C',
},
],
'condition': 'checkout_android',
@@ -427,7 +427,7 @@
'packages': [
{
'package': 'chromium/third_party/android_build_tools/manifest_merger',
- 'version': 'UwtCH6usmvLSrqbzGSTrjqJ1AJnNh-Vkq4hCEKvDM5oC',
+ 'version': '8fr-1Vf_pfxN9ulzWVaZvIXggDgWDs-0dtlGA1Sue48C',
},
],
'condition': 'checkout_android',
diff --git a/sdk/android/native_api/jni/java_types.cc b/sdk/android/native_api/jni/java_types.cc
index 87406d1..7bc3d8f 100644
--- a/sdk/android/native_api/jni/java_types.cc
+++ b/sdk/android/native_api/jni/java_types.cc
@@ -178,19 +178,35 @@
}
ScopedJavaLocalRef<jobject> NativeToJavaBoolean(JNIEnv* env, bool b) {
+#ifdef RTC_JNI_GENERATOR_LEGACY_SYMBOLS
return JNI_Boolean::Java_Boolean_ConstructorJLB_Z(env, b);
+#else
+ return JNI_Boolean::Java_Boolean_Constructor__boolean(env, b);
+#endif
}
ScopedJavaLocalRef<jobject> NativeToJavaDouble(JNIEnv* env, double d) {
+#ifdef RTC_JNI_GENERATOR_LEGACY_SYMBOLS
return JNI_Double::Java_Double_ConstructorJLD_D(env, d);
+#else
+ return JNI_Double::Java_Double_Constructor__double(env, d);
+#endif
}
ScopedJavaLocalRef<jobject> NativeToJavaInteger(JNIEnv* jni, int32_t i) {
+#ifdef RTC_JNI_GENERATOR_LEGACY_SYMBOLS
return JNI_Integer::Java_Integer_ConstructorJLI_I(jni, i);
+#else
+ return JNI_Integer::Java_Integer_Constructor__int(jni, i);
+#endif
}
ScopedJavaLocalRef<jobject> NativeToJavaLong(JNIEnv* env, int64_t u) {
+#ifdef RTC_JNI_GENERATOR_LEGACY_SYMBOLS
return JNI_Long::Java_Long_ConstructorJLLO_J(env, u);
+#else
+ return JNI_Long::Java_Long_Constructor__long(env, u);
+#endif
}
ScopedJavaLocalRef<jstring> NativeToJavaString(JNIEnv* env, const char* str) {
@@ -324,17 +340,33 @@
}
JavaListBuilder::JavaListBuilder(JNIEnv* env)
- : env_(env), j_list_(JNI_ArrayList::Java_ArrayList_ConstructorJUALI(env)) {}
+#ifdef RTC_JNI_GENERATOR_LEGACY_SYMBOLS
+ : env_(env),
+ j_list_(JNI_ArrayList::Java_ArrayList_ConstructorJUALI(env)) {}
+#else
+ : env_(env), j_list_(JNI_ArrayList::Java_ArrayList_Constructor(env)) {
+}
+#endif
-JavaListBuilder::~JavaListBuilder() = default;
+ JavaListBuilder::~JavaListBuilder() = default;
void JavaListBuilder::add(const JavaRef<jobject>& element) {
+#ifdef RTC_JNI_GENERATOR_LEGACY_SYMBOLS
JNI_ArrayList::Java_ArrayList_addZ_JUE(env_, j_list_, element);
+#else
+ JNI_ArrayList::Java_ArrayList_add(env_, j_list_, element);
+#endif
}
JavaMapBuilder::JavaMapBuilder(JNIEnv* env)
: env_(env),
- j_map_(JNI_LinkedHashMap::Java_LinkedHashMap_ConstructorJULIHM(env)) {}
+#ifdef RTC_JNI_GENERATOR_LEGACY_SYMBOLS
+ j_map_(JNI_LinkedHashMap::Java_LinkedHashMap_ConstructorJULIHM(env)) {
+}
+#else
+ j_map_(JNI_LinkedHashMap::Java_LinkedHashMap_Constructor(env)) {
+}
+#endif
JavaMapBuilder::~JavaMapBuilder() = default;
diff --git a/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc b/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc
index 578518c..8d0e34c 100644
--- a/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc
+++ b/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc
@@ -26,8 +26,13 @@
namespace {
ScopedJavaLocalRef<jobject> NativeToJavaBigInteger(JNIEnv* env, uint64_t u) {
+#ifdef RTC_JNI_GENERATOR_LEGACY_SYMBOLS
return JNI_BigInteger::Java_BigInteger_ConstructorJMBI_JLS(
env, NativeToJavaString(env, rtc::ToString(u)));
+#else
+ return JNI_BigInteger::Java_BigInteger_Constructor__String(
+ env, NativeToJavaString(env, rtc::ToString(u)));
+#endif
}
ScopedJavaLocalRef<jobjectArray> NativeToJavaBigIntegerArray(
