mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Roll chromium_revision 49983e8c01..93bbe3fbc0 (1242712:1244582)

Browse source 
Change log: 49983e8c01..93bbe3fbc0
Full diff: 49983e8c01..93bbe3fbc0

Changed dependencies
* fuchsia_version: version:17.20231218.3.1..version:17.20240105.3.1
* src/base: 1a6ee27f96..44d8736657
* src/build: b4c3d1df5f..e920e5bbda
* src/buildtools: 5e016b7d32..f5d99b3266
* src/ios: 566a1bd097..6103905d1b
* src/testing: 5d325c28aa..ee8b405f32
* src/third_party: 68c88f4ea9..dd54978044
* src/third_party/android_build_tools/manifest_merger: WTmajghAylCsg6DjtBSRd1dHKUjkkeex-9ASgLJ0cu8C..00I6IYO5b1mwIYv-jWPmTZvw3paoypOPHYEg9vpqFDUC
* src/third_party/androidx: fxep2qUxHMuSadHbR8ufKuYVmB9SKknNkkBDLneqqhwC..FDe_K3g_4EJbBdE-dAJHpM0XG6rt6GyjbI31j2ozMTgC
* src/third_party/breakpad/breakpad: f49c2f1a20..22f54f197f
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/65730c4295..f582f5bb51
* src/third_party/depot_tools: 259976c748..6953ebe3c1
* src/third_party/freetype/src: a07ca46cd0..7bac4d146a
* src/third_party/harfbuzz-ng/src: 920c40cd43..155015f4be
* src/third_party/libc++/src: 15db46be4e..8c2468e9dd
* src/third_party/libc++abi/src: 7451ba4b85..f80f02a81e
* src/third_party/libunwind/src: 2602aecdf4..42293b96f8
* src/third_party/perfetto: 805d611c93..8650986e8c
* src/third_party/r8: Deex61FDXcnUcwzjKHy_-EIsIgHjWot2d7dcvIsk3BQC..kTbaOlJzi5hYF_n8tweI4zxcmTeJ0wo7ckimuDOpkYwC
* src/third_party/turbine: M27KV5bN2pvX97rzQXxamxLUFHmKEes8wvZevk8nU2YC..ABguU2WKErRBdXX1LMt0zqZListLS_05X0Rp_V7pwAYC
* src/tools: 1be790cb8e..708b76cf07
DEPS diff: 49983e8c01..93bbe3fbc0/DEPS

Clang version changed llvmorg-18-init-14420-gea3a3b25:llvmorg-18-init-16072-gc4146121e940
Details: 49983e8c01..93bbe3fbc0/tools/clang/scripts/update.py

BUG=None

Change-Id: I1ca84db4f5eda38a93125fbdde51536f680df264
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/333880
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41488}
This commit is contained in:
Bjorn Terelius 2024-01-09 13:18:30 +01:00 committed by WebRTC LUCI CQ
parent 5d091cec5d
commit 3a20023719
2 changed files with 40 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
DEPS
View file

@ -10,7 +10,7 @@ vars = {
# chromium waterfalls. More info at: crbug.com/570091. # chromium waterfalls. More info at: crbug.com/570091.
'checkout_configuration': 'default', 'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'chromium_revision': '49983e8c0142d92f596489a8906c1c20631a5a07', 'chromium_revision': '93bbe3fbc0d15278b5e866b818783c0c3a4d05fc',
# Fetch the prebuilt binaries for llvm-cov and llvm-profdata. Needed to # Fetch the prebuilt binaries for llvm-cov and llvm-profdata. Needed to
# process the raw profiles produced by instrumented targets (built with # process the raw profiles produced by instrumented targets (built with
@ -25,7 +25,7 @@ vars = {
# By default, download the fuchsia sdk from the public sdk directory. # By default, download the fuchsia sdk from the public sdk directory.
'fuchsia_sdk_cipd_prefix': 'fuchsia/sdk/core/', 'fuchsia_sdk_cipd_prefix': 'fuchsia/sdk/core/',
'fuchsia_version': 'version:17.20231218.3.1', 'fuchsia_version': 'version:17.20240105.3.1',
# By default, download the fuchsia images from the fuchsia GCS bucket. # By default, download the fuchsia images from the fuchsia GCS bucket.
'fuchsia_images_bucket': 'fuchsia', 'fuchsia_images_bucket': 'fuchsia',
'checkout_fuchsia': False, 'checkout_fuchsia': False,
@ -50,24 +50,24 @@ vars = {
deps = { deps = {
# TODO(kjellander): Move this to be Android-only. # TODO(kjellander): Move this to be Android-only.
'src/base': 'src/base':
'https://chromium.googlesource.com/chromium/src/base@1a6ee27f964d97882c10d1ea190e3440d3654369', 'https://chromium.googlesource.com/chromium/src/base@44d8736657f2c0e3bd546cf8946a6126f1fc4c2a',
'src/build': 'src/build':
'https://chromium.googlesource.com/chromium/src/build@b4c3d1df5f637cb4be2e8bc16436f33a35a2e5b0', 'https://chromium.googlesource.com/chromium/src/build@e920e5bbda5928b942f75c41f15bfd0f86ad3d18',
'src/buildtools': 'src/buildtools':
'https://chromium.googlesource.com/chromium/src/buildtools@5e016b7d32822a0cbc3c65162aa9fc2bd021f275', 'https://chromium.googlesource.com/chromium/src/buildtools@f5d99b3266346c571f36f443a5256d6ac82f6d28',
# Gradle 6.6.1. Used for testing Android Studio project generation for WebRTC. # Gradle 6.6.1. Used for testing Android Studio project generation for WebRTC.
'src/examples/androidtests/third_party/gradle': { 'src/examples/androidtests/third_party/gradle': {
'url': 'https://chromium.googlesource.com/external/github.com/gradle/gradle.git@f2d1fb54a951d8b11d25748e4711bec8d128d7e3', 'url': 'https://chromium.googlesource.com/external/github.com/gradle/gradle.git@f2d1fb54a951d8b11d25748e4711bec8d128d7e3',
'condition': 'checkout_android', 'condition': 'checkout_android',
}, },
'src/ios': { 'src/ios': {
'url': 'https://chromium.googlesource.com/chromium/src/ios@566a1bd097250406c592318b7af13e37e18df57c', 'url': 'https://chromium.googlesource.com/chromium/src/ios@6103905d1b6ab8839d5b3de9f5107c8153fcf70a',
'condition': 'checkout_ios', 'condition': 'checkout_ios',
}, },
'src/testing': 'src/testing':
'https://chromium.googlesource.com/chromium/src/testing@5d325c28aa58108b547b11ca9204e5b70b03f31d', 'https://chromium.googlesource.com/chromium/src/testing@ee8b405f32fcc366e1db1f516906ffaf9197c8e4',
'src/third_party': 'src/third_party':
'https://chromium.googlesource.com/chromium/src/third_party@68c88f4ea9357022d240188017e8c8930bed5791', 'https://chromium.googlesource.com/chromium/src/third_party@dd54978044b3d31891d7d62bc1becd51c8f3e2cc',
'src/buildtools/linux64': { 'src/buildtools/linux64': {
'packages': [ 'packages': [
@ -115,11 +115,11 @@ deps = {
'src/third_party/clang-format/script': 'src/third_party/clang-format/script':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@e5337933f2951cacd3aeacd238ce4578163ca0b9', 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@e5337933f2951cacd3aeacd238ce4578163ca0b9',
'src/third_party/libc++/src': 'src/third_party/libc++/src':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@15db46be4ec5e2c31a35bf07357b5025e2754693', 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@8c2468e9dd286ad856b615ce9adf101b350ab94d',
'src/third_party/libc++abi/src': 'src/third_party/libc++abi/src':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@7451ba4b852aa031667d0331b7fd13afabd6b232', 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@f80f02a81e1d26217a9d15094600813e93eee6fb',
'src/third_party/libunwind/src': 'src/third_party/libunwind/src':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@2602aecdf4bfa2a4bd70722937b2ec503d8c46c8', 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@42293b96f85c4ef886ff723a80c43074c395a202',
'src/third_party/ninja': { 'src/third_party/ninja': {
'packages': [ 'packages': [
@ -187,9 +187,9 @@ deps = {
'src/third_party/boringssl/src': 'src/third_party/boringssl/src':
'https://boringssl.googlesource.com/boringssl.git@85e2f2c655a13e29988df777ed680ddf0969434d', 'https://boringssl.googlesource.com/boringssl.git@85e2f2c655a13e29988df777ed680ddf0969434d',
'src/third_party/breakpad/breakpad': 'src/third_party/breakpad/breakpad':
'https://chromium.googlesource.com/breakpad/breakpad.git@f49c2f1a2023da0cb055874fba050563dfea57db', 'https://chromium.googlesource.com/breakpad/breakpad.git@22f54f197fe5be28abda6e00bdfaaed9e87f9851',
'src/third_party/catapult': 'src/third_party/catapult':
'https://chromium.googlesource.com/catapult.git@65730c4295c0bcd15c0e817d7f8a1566c6342211', 'https://chromium.googlesource.com/catapult.git@f582f5bb517bba92e76d8edec281211d65534e20',
'src/third_party/ced/src': { 'src/third_party/ced/src': {
'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5', 'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5',
}, },
@ -202,7 +202,7 @@ deps = {
'src/third_party/crc32c/src': 'src/third_party/crc32c/src':
'https://chromium.googlesource.com/external/github.com/google/crc32c.git@fa5ade41ee480003d9c5af6f43567ba22e4e17e6', 'https://chromium.googlesource.com/external/github.com/google/crc32c.git@fa5ade41ee480003d9c5af6f43567ba22e4e17e6',
'src/third_party/depot_tools': 'src/third_party/depot_tools':
'https://chromium.googlesource.com/chromium/tools/depot_tools.git@259976c7483c321c122169d193e150310f4ea609', 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@6953ebe3c1825e0f548e8c124a3b85f6c75dbc73',
'src/third_party/ffmpeg': 'src/third_party/ffmpeg':
'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@17525de887d54b970ffdd421a0879c1db1952307', 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@17525de887d54b970ffdd421a0879c1db1952307',
'src/third_party/flatbuffers/src': 'src/third_party/flatbuffers/src':
@ -216,9 +216,9 @@ deps = {
'condition': 'checkout_linux', 'condition': 'checkout_linux',
}, },
'src/third_party/freetype/src': 'src/third_party/freetype/src':
'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@a07ca46cd0fcb4af99ae831dee803d3bddf01dd6', 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@7bac4d146a86482c154bf878221ff321faccac4c',
'src/third_party/harfbuzz-ng/src': 'src/third_party/harfbuzz-ng/src':
'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@920c40cd43dd7b10b7ecba3d82a46f5fea88536f', 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@155015f4bec434ecc2f94621665844218f05ce51',
'src/third_party/google_benchmark/src': { 'src/third_party/google_benchmark/src': {
'url': 'https://chromium.googlesource.com/external/github.com/google/benchmark.git@b177433f3ee2513b1075140c723d73ab8901790f', 'url': 'https://chromium.googlesource.com/external/github.com/google/benchmark.git@b177433f3ee2513b1075140c723d73ab8901790f',
}, },
@ -302,7 +302,7 @@ deps = {
'condition': 'checkout_android', 'condition': 'checkout_android',
}, },
'src/third_party/perfetto': 'src/third_party/perfetto':
'https://android.googlesource.com/platform/external/perfetto.git@805d611c93590352f8b31108e07ddcc5d2ecd4f8', 'https://android.googlesource.com/platform/external/perfetto.git@8650986e8c88c2e993559e1129e58e06bf46d162',
'src/third_party/libvpx/source/libvpx': 'src/third_party/libvpx/source/libvpx':
'https://chromium.googlesource.com/webm/libvpx.git@df655cf4fb6c2a23b964544acd015cc715752830', 'https://chromium.googlesource.com/webm/libvpx.git@df655cf4fb6c2a23b964544acd015cc715752830',
'src/third_party/libyuv': 'src/third_party/libyuv':
@ -331,7 +331,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'chromium/third_party/r8', 'package': 'chromium/third_party/r8',
'version': 'Deex61FDXcnUcwzjKHy_-EIsIgHjWot2d7dcvIsk3BQC', 'version': 'kTbaOlJzi5hYF_n8tweI4zxcmTeJ0wo7ckimuDOpkYwC',
}, },
], ],
'condition': 'checkout_android', 'condition': 'checkout_android',
@ -355,7 +355,7 @@ deps = {
'condition': 'checkout_android', 'condition': 'checkout_android',
}, },
'src/tools': 'src/tools':
'https://chromium.googlesource.com/chromium/src/tools@1be790cb8e9bc832834848c3aea096ba080a14b4', 'https://chromium.googlesource.com/chromium/src/tools@708b76cf07bec55aaddb62c76b69a00847e8ebe3',
'src/third_party/accessibility_test_framework': { 'src/third_party/accessibility_test_framework': {
'packages': [ 'packages': [
@ -405,7 +405,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'chromium/third_party/androidx', 'package': 'chromium/third_party/androidx',
'version': 'fxep2qUxHMuSadHbR8ufKuYVmB9SKknNkkBDLneqqhwC', 'version': 'FDe_K3g_4EJbBdE-dAJHpM0XG6rt6GyjbI31j2ozMTgC',
}, },
], ],
'condition': 'checkout_android', 'condition': 'checkout_android',
@ -416,7 +416,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'chromium/third_party/android_build_tools/manifest_merger', 'package': 'chromium/third_party/android_build_tools/manifest_merger',
'version': 'WTmajghAylCsg6DjtBSRd1dHKUjkkeex-9ASgLJ0cu8C', 'version': '00I6IYO5b1mwIYv-jWPmTZvw3paoypOPHYEg9vpqFDUC',
}, },
], ],
'condition': 'checkout_android', 'condition': 'checkout_android',
@ -498,7 +498,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'chromium/third_party/turbine', 'package': 'chromium/third_party/turbine',
'version': 'M27KV5bN2pvX97rzQXxamxLUFHmKEes8wvZevk8nU2YC', 'version': 'ABguU2WKErRBdXX1LMt0zqZListLS_05X0Rp_V7pwAYC',
}, },
], ],
'condition': 'checkout_android', 'condition': 'checkout_android',

28
sdk/android/src/jni/jni_generator_helper.h
View file

@ -77,20 +77,15 @@ class MethodID {
} // namespace webrtc } // namespace webrtc
// Re-export relevant classes into the namespaces the script expects. namespace jni_zero {
namespace base {
namespace android {
// Re-export relevant classes into the namespaces the script expects.
using webrtc::JavaParamRef; using webrtc::JavaParamRef;
using webrtc::JavaRef; using webrtc::JavaRef;
using webrtc::LazyGetClass; using webrtc::LazyGetClass;
using webrtc::MethodID; using webrtc::MethodID;
using webrtc::ScopedJavaLocalRef; using webrtc::ScopedJavaLocalRef;
} // namespace android
} // namespace base
namespace jni_zero {
inline void CheckException(JNIEnv* env) { inline void CheckException(JNIEnv* env) {
CHECK_EXCEPTION(env); CHECK_EXCEPTION(env);
} }
@ -112,7 +107,7 @@ struct BASE_EXPORT JniJavaCallContextUnchecked {
} }
// Force no inline to reduce code size. // Force no inline to reduce code size.
template <base::android::MethodID::Type type> template <jni_zero::MethodID::Type type>
void Init(JNIEnv* env, void Init(JNIEnv* env,
jclass clazz, jclass clazz,
const char* method_name, const char* method_name,
@ -125,7 +120,7 @@ struct BASE_EXPORT JniJavaCallContextUnchecked {
// Gets PC of the calling function. // Gets PC of the calling function.
pc = reinterpret_cast<uintptr_t>(__builtin_return_address(0)); pc = reinterpret_cast<uintptr_t>(__builtin_return_address(0));
method_id = base::android::MethodID::LazyGet<type>( method_id = jni_zero::MethodID::LazyGet<type>(
env, clazz, method_name, jni_signature, atomic_method_id); env, clazz, method_name, jni_signature, atomic_method_id);
} }
@ -145,7 +140,7 @@ struct BASE_EXPORT JniJavaCallContextUnchecked {
// Context about the JNI call with exception unchecked to be stored in stack. // Context about the JNI call with exception unchecked to be stored in stack.
struct BASE_EXPORT JniJavaCallContextChecked { struct BASE_EXPORT JniJavaCallContextChecked {
// Force no inline to reduce code size. // Force no inline to reduce code size.
template <base::android::MethodID::Type type> template <jni_zero::MethodID::Type type>
void Init(JNIEnv* env, void Init(JNIEnv* env,
jclass clazz, jclass clazz,
const char* method_name, const char* method_name,
@ -174,4 +169,17 @@ using jni_zero::JniJavaCallContextChecked;
using jni_zero::JniJavaCallContextUnchecked; using jni_zero::JniJavaCallContextUnchecked;
} // namespace jni_generator } // namespace jni_generator
// Re-export helpers in the namespaces that the old jni_generator script
// expects.
// TODO(b/319078685): Remove once all uses of the jni_generator has been
// updated.
namespace base {
namespace android {
using webrtc::JavaParamRef;
using webrtc::JavaRef;
using webrtc::LazyGetClass;
using webrtc::MethodID;
using webrtc::ScopedJavaLocalRef;
} // namespace android
} // namespace base
#endif // SDK_ANDROID_SRC_JNI_JNI_GENERATOR_HELPER_H_ #endif // SDK_ANDROID_SRC_JNI_JNI_GENERATOR_HELPER_H_