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

Roll chromium_revision 6ac7929166..eef62e8a0c (1190797:1197906)

Browse source 
Change log: 6ac7929166..eef62e8a0c
Full diff: 6ac7929166..eef62e8a0c

Changed dependencies
* fuchsia_version: version:14.20230826.1.1..version:15.20230909.2.1
* reclient_version: re_client_version:0.113.0.8b45b89-gomaip..re_client_version:0.114.2.81e819b-gomaip
* src/base: 609cafa975..10140da63a
* src/build: 115a707991..c5658c73de
* src/buildtools: b2043d4f43..a567506e78
* src/buildtools/linux64: git_revision:cc56a0f98bb34accd5323316e0292575ff17a5d4..git_revision:991530ce394efb58fcd848195469022fa17ae126
* src/buildtools/mac: git_revision:cc56a0f98bb34accd5323316e0292575ff17a5d4..git_revision:991530ce394efb58fcd848195469022fa17ae126
* src/buildtools/reclient: re_client_version:0.113.0.8b45b89-gomaip..re_client_version:0.114.2.81e819b-gomaip
* src/buildtools/win: git_revision:cc56a0f98bb34accd5323316e0292575ff17a5d4..git_revision:991530ce394efb58fcd848195469022fa17ae126
* src/ios: 17864bdc8f..91328c276e
* src/testing: ff8dee88bc..ac71f97e4a
* src/third_party: ee6367daea..935018fd37
* src/third_party/android_build_tools/manifest_merger: kkbYOGsVRXhtxBiXuTufY0puTnG5QAfyxvFTBHFWL08C..FlwnxEZ1wdjoQfedkF4MiZgo8pD48-_CJNA7RnU6as4C
* src/third_party/android_toolchain/ndk: R_8suM8m0oHbZ1awdxGXvKEFpAOETscbfZxkkMthyk8C..3vHltFqfgIw8wZ38ggGM9c7Eyw_AHZnwCgFIVtc9gngC
* src/third_party/androidx: 2n47PFweHFzGxPWjh9RANTrGhmSDWowZ-YhkOV4j11MC..zIMLlRAldYvFj1UOOB-KZX_1YKfWx4vfYoCYVyF1XUsC
* src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/b8e012e1ff..3aecf1d00b
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/b8c4f2d99a..0dfa3b81d7
* src/third_party/depot_tools: 427f0f43ad..523537049c
* src/third_party/freetype/src: dd1ced4ee3..d7b63a966b
* src/third_party/kotlin_stdlib: 6cGkpHi3fSRhpRfq2b1mjmzfFmShvtQe6gy4g2nFQd0C..7XCiIAlSi36gvPwOn8N4Q1GE9sMLw6V1RljM9151cWIC
* src/third_party/libc++/src: 84fb809dd6..7cee6b00d3
* src/third_party/libc++abi/src: 3d83ca7bd2..f6a17c88dd
* src/third_party/libunwind/src: 76e621a897..d9b4abf6b6
* src/third_party/libvpx/source/libvpx: 24c0dcc851..6da1bd01d6
* src/third_party/perfetto: 00427277dd..9a3ec114fc
* src/third_party/r8: TBaeKaSTY2ttKx2JSFuWiQ8Na80KHZwLEgSAvT1DBJ0C..WptUn43oi_BkFPtEyZTdUD9wZo1yy8OPVqFwdP3jmqoC
* src/third_party/turbine: ZlMS4BOYyYmbU8BuBDGyW7QrkvZ_-pTkm4lH4jKjTi4C..laSnfZnTgkmZynERrjAlU3yeqB5rN446BctGmKQsZ64C
* src/tools: 3e78ed797e..723bed483d
* src/tools/luci-go: git_revision:fe3cfd422b1012c2c8cf00d65cdb11aa2c26cd66..git_revision:8b73cff3b780a7136c4904103f19124d2be3dee1
* src/tools/luci-go: git_revision:fe3cfd422b1012c2c8cf00d65cdb11aa2c26cd66..git_revision:8b73cff3b780a7136c4904103f19124d2be3dee1
DEPS diff: 6ac7929166..eef62e8a0c/DEPS

Clang version changed llvmorg-17-init-16420-g0c545a44:llvmorg-18-init-4631-gd50b56d1
Details: 6ac7929166..eef62e8a0c/tools/clang/scripts/update.py

BUG=chromium:1481493,chromium:1483216,b/298960678

Change-Id: I934c827a71d332242ff182de08ba145c8eb8ec04
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/320680
Reviewed-by: Jeremy Leconte <jleconte@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40767}
This commit is contained in:
Jeremy Leconte 2023-09-19 10:09:06 +02:00 committed by WebRTC LUCI CQ
parent e14d122a7b
commit 2e7ed0d615
8 changed files with 46 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
BUILD.gn
View file

@ -30,6 +30,7 @@ if (rtc_enable_protobuf) {
if (is_android) { if (is_android) {
import("//build/config/android/config.gni") import("//build/config/android/config.gni")
import("//build/config/android/rules.gni") import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")
} }
if (!build_with_chromium) { if (!build_with_chromium) {

62
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': '6ac79291669656814b2c66e66ea296caac6652fd', 'chromium_revision': 'eef62e8a0c5806c4fca5674448f9ecdb100b74af',
# 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,14 +25,14 @@ 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:14.20230826.1.1', 'fuchsia_version': 'version:15.20230909.2.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,
# Since the images are hundreds of MB, default to only downloading the image # Since the images are hundreds of MB, default to only downloading the image
# most commonly useful for developers. Bots and developers that need to use # most commonly useful for developers. Bots and developers that need to use
# other images can override this with additional images. # other images can override this with additional images.
'checkout_fuchsia_boot_images': "terminal.qemu-x64", 'checkout_fuchsia_boot_images': "terminal.qemu-x64,terminal.x64",
'checkout_fuchsia_product_bundles': '"{checkout_fuchsia_boot_images}" != ""', 'checkout_fuchsia_product_bundles': '"{checkout_fuchsia_boot_images}" != ""',
# Fetch configuration files required for the 'use_remoteexec' gn arg # Fetch configuration files required for the 'use_remoteexec' gn arg
@ -40,7 +40,7 @@ vars = {
# RBE instance to use for running remote builds # RBE instance to use for running remote builds
'rbe_instance': 'projects/rbe-webrtc-developer/instances/default_instance', 'rbe_instance': 'projects/rbe-webrtc-developer/instances/default_instance',
# reclient CIPD package version # reclient CIPD package version
'reclient_version': 're_client_version:0.113.0.8b45b89-gomaip', 'reclient_version': 're_client_version:0.114.2.81e819b-gomaip',
# ninja CIPD package version # ninja CIPD package version
# https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja # https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja
@ -50,30 +50,30 @@ 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@609cafa975c8a29d3b2f686c9a42530a556835fe', 'https://chromium.googlesource.com/chromium/src/base@10140da63ad68121f2b82eb99ef502527386ad1b',
'src/build': 'src/build':
'https://chromium.googlesource.com/chromium/src/build@115a7079919c25462a7fd8c1d22900378bbc6585', 'https://chromium.googlesource.com/chromium/src/build@c5658c73de351e441df358e74ae9cab53e74430e',
'src/buildtools': 'src/buildtools':
'https://chromium.googlesource.com/chromium/src/buildtools@b2043d4f435131d0a1bdd5342c17753ef9236572', 'https://chromium.googlesource.com/chromium/src/buildtools@a567506e78c95d3e7fc98263ce2dc1c7444a8b3a',
# 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@17864bdc8fb2f78060ea4109d61a9144f64f4d67', 'url': 'https://chromium.googlesource.com/chromium/src/ios@91328c276e90dfd882812ce60601c227047011bd',
'condition': 'checkout_ios', 'condition': 'checkout_ios',
}, },
'src/testing': 'src/testing':
'https://chromium.googlesource.com/chromium/src/testing@ff8dee88bc0b49f8337cee6e82151c245a63b98c', 'https://chromium.googlesource.com/chromium/src/testing@ac71f97e4ae05a7b6904138fe1e970c75fc0ef46',
'src/third_party': 'src/third_party':
'https://chromium.googlesource.com/chromium/src/third_party@ee6367daea550c5845a6079cec5fd6555f39144f', 'https://chromium.googlesource.com/chromium/src/third_party@935018fd375977ed14ce165e3f7908771f5a8d39',
'src/buildtools/linux64': { 'src/buildtools/linux64': {
'packages': [ 'packages': [
{ {
'package': 'gn/gn/linux-${{arch}}', 'package': 'gn/gn/linux-${{arch}}',
'version': 'git_revision:cc56a0f98bb34accd5323316e0292575ff17a5d4', 'version': 'git_revision:991530ce394efb58fcd848195469022fa17ae126',
} }
], ],
'dep_type': 'cipd', 'dep_type': 'cipd',
@ -83,7 +83,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'gn/gn/mac-${{arch}}', 'package': 'gn/gn/mac-${{arch}}',
'version': 'git_revision:cc56a0f98bb34accd5323316e0292575ff17a5d4', 'version': 'git_revision:991530ce394efb58fcd848195469022fa17ae126',
} }
], ],
'dep_type': 'cipd', 'dep_type': 'cipd',
@ -93,7 +93,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'gn/gn/windows-amd64', 'package': 'gn/gn/windows-amd64',
'version': 'git_revision:cc56a0f98bb34accd5323316e0292575ff17a5d4', 'version': 'git_revision:991530ce394efb58fcd848195469022fa17ae126',
} }
], ],
'dep_type': 'cipd', 'dep_type': 'cipd',
@ -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@84fb809dd6dae36d556dc0bb702c6cc2ce9d4b80', 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@7cee6b00d34adc4da2ff2a4d373e44fc27a9a223',
'src/third_party/libc++abi/src': 'src/third_party/libc++abi/src':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@3d83ca7bd2ab81f042bafe6996da08c9cd57c119', 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@f6a17c88dd9cb8e433f0181f747e2b49014485af',
'src/third_party/libunwind/src': 'src/third_party/libunwind/src':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@76e621a89787516da745489245d8b65a48ad60d8', 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@d9b4abf6b6c3e4541766df4eedaf534ed1322a8e',
'src/third_party/ninja': { 'src/third_party/ninja': {
'packages': [ 'packages': [
@ -174,11 +174,11 @@ deps = {
}, },
'src/third_party/boringssl/src': 'src/third_party/boringssl/src':
'https://boringssl.googlesource.com/boringssl.git@b8e012e1ff736cc794273af4a7db521e6b18bcd5', 'https://boringssl.googlesource.com/boringssl.git@3aecf1d00bf62fa40bee0c93525df52204f48d4a',
'src/third_party/breakpad/breakpad': 'src/third_party/breakpad/breakpad':
'https://chromium.googlesource.com/breakpad/breakpad.git@8988364bcddd9b194b0bf931c10bc125987330ed', 'https://chromium.googlesource.com/breakpad/breakpad.git@8988364bcddd9b194b0bf931c10bc125987330ed',
'src/third_party/catapult': 'src/third_party/catapult':
'https://chromium.googlesource.com/catapult.git@b8c4f2d99ac66fe47cb8cceec0dd1a1da5d1b51e', 'https://chromium.googlesource.com/catapult.git@0dfa3b81d73a7bb0c5f3a189d25884d1c7da21a2',
'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',
}, },
@ -191,7 +191,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@427f0f43ad0ceb08399561ab9cc60e45931059d3', 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@523537049c229b2dac5bcd6108f3c231db34094b',
'src/third_party/ffmpeg': 'src/third_party/ffmpeg':
'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@0ba37733400593b162e5ae9ff26b384cff49c250', 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@0ba37733400593b162e5ae9ff26b384cff49c250',
'src/third_party/flatbuffers/src': 'src/third_party/flatbuffers/src':
@ -205,7 +205,7 @@ 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@dd1ced4ee37b375686a1e0fb6e3a6966b195f4ab', 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@d7b63a966bdedeb52511913bc9d7de170b213d7e',
'src/third_party/harfbuzz-ng/src': 'src/third_party/harfbuzz-ng/src':
'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@db700b5670d9475cc8ed4880cc9447b232c5e432', 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@db700b5670d9475cc8ed4880cc9447b232c5e432',
'src/third_party/google_benchmark/src': { 'src/third_party/google_benchmark/src': {
@ -262,7 +262,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'chromium/third_party/kotlin_stdlib', 'package': 'chromium/third_party/kotlin_stdlib',
'version': '6cGkpHi3fSRhpRfq2b1mjmzfFmShvtQe6gy4g2nFQd0C', 'version': '7XCiIAlSi36gvPwOn8N4Q1GE9sMLw6V1RljM9151cWIC',
}, },
], ],
'condition': 'checkout_android', 'condition': 'checkout_android',
@ -295,9 +295,9 @@ deps = {
'condition': 'checkout_android', 'condition': 'checkout_android',
}, },
'src/third_party/perfetto': 'src/third_party/perfetto':
'https://android.googlesource.com/platform/external/perfetto.git@00427277dd1728c836d92f78006c60430c04d6bc', 'https://android.googlesource.com/platform/external/perfetto.git@9a3ec114fc10be0f1fa85d4bec1c59f9e71c8aa5',
'src/third_party/libvpx/source/libvpx': 'src/third_party/libvpx/source/libvpx':
'https://chromium.googlesource.com/webm/libvpx.git@24c0dcc8513b8c1ba4ffbf934a399f89de646ffe', 'https://chromium.googlesource.com/webm/libvpx.git@6da1bd01d64d3d246b633bf25c766dfe751345b7',
'src/third_party/libyuv': 'src/third_party/libyuv':
'https://chromium.googlesource.com/libyuv/libyuv.git@04821d1e7d60845525e8db55c7bcd41ef5be9406', 'https://chromium.googlesource.com/libyuv/libyuv.git@04821d1e7d60845525e8db55c7bcd41ef5be9406',
'src/third_party/lss': { 'src/third_party/lss': {
@ -320,7 +320,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'chromium/third_party/r8', 'package': 'chromium/third_party/r8',
'version': 'TBaeKaSTY2ttKx2JSFuWiQ8Na80KHZwLEgSAvT1DBJ0C', 'version': 'WptUn43oi_BkFPtEyZTdUD9wZo1yy8OPVqFwdP3jmqoC',
}, },
], ],
'condition': 'checkout_android', 'condition': 'checkout_android',
@ -344,7 +344,7 @@ deps = {
'condition': 'checkout_android', 'condition': 'checkout_android',
}, },
'src/tools': 'src/tools':
'https://chromium.googlesource.com/chromium/src/tools@3e78ed797e9e5308cb90f319c7330a6d44dac2c7', 'https://chromium.googlesource.com/chromium/src/tools@723bed483d5a20fe886d9a7c8c25c1f183121687',
'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/android_toolchain/android_toolchain', 'package': 'chromium/third_party/android_toolchain/android_toolchain',
'version': 'R_8suM8m0oHbZ1awdxGXvKEFpAOETscbfZxkkMthyk8C', 'version': '3vHltFqfgIw8wZ38ggGM9c7Eyw_AHZnwCgFIVtc9gngC',
}, },
], ],
'condition': 'checkout_android', 'condition': 'checkout_android',
@ -416,7 +416,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'chromium/third_party/androidx', 'package': 'chromium/third_party/androidx',
'version': '2n47PFweHFzGxPWjh9RANTrGhmSDWowZ-YhkOV4j11MC', 'version': 'zIMLlRAldYvFj1UOOB-KZX_1YKfWx4vfYoCYVyF1XUsC',
}, },
], ],
'condition': 'checkout_android', 'condition': 'checkout_android',
@ -427,7 +427,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'chromium/third_party/android_build_tools/manifest_merger', 'package': 'chromium/third_party/android_build_tools/manifest_merger',
'version': 'kkbYOGsVRXhtxBiXuTufY0puTnG5QAfyxvFTBHFWL08C', 'version': 'FlwnxEZ1wdjoQfedkF4MiZgo8pD48-_CJNA7RnU6as4C',
}, },
], ],
'condition': 'checkout_android', 'condition': 'checkout_android',
@ -521,7 +521,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'chromium/third_party/turbine', 'package': 'chromium/third_party/turbine',
'version': 'ZlMS4BOYyYmbU8BuBDGyW7QrkvZ_-pTkm4lH4jKjTi4C', 'version': 'laSnfZnTgkmZynERrjAlU3yeqB5rN446BctGmKQsZ64C',
}, },
], ],
'condition': 'checkout_android', 'condition': 'checkout_android',
@ -532,11 +532,11 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'infra/tools/luci/isolate/${{platform}}', 'package': 'infra/tools/luci/isolate/${{platform}}',
'version': 'git_revision:fe3cfd422b1012c2c8cf00d65cdb11aa2c26cd66', 'version': 'git_revision:8b73cff3b780a7136c4904103f19124d2be3dee1',
}, },
{ {
'package': 'infra/tools/luci/swarming/${{platform}}', 'package': 'infra/tools/luci/swarming/${{platform}}',
'version': 'git_revision:fe3cfd422b1012c2c8cf00d65cdb11aa2c26cd66', 'version': 'git_revision:8b73cff3b780a7136c4904103f19124d2be3dee1',
}, },
], ],
'dep_type': 'cipd', 'dep_type': 'cipd',

1
examples/BUILD.gn
View file

@ -11,6 +11,7 @@ import("../webrtc.gni")
if (is_android) { if (is_android) {
import("//build/config/android/config.gni") import("//build/config/android/config.gni")
import("//build/config/android/rules.gni") import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")
} else if (is_mac) { } else if (is_mac) {
import("//build/config/mac/rules.gni") import("//build/config/mac/rules.gni")
} else if (is_ios) { } else if (is_ios) {

1
examples/androidnativeapi/BUILD.gn
View file

@ -1,6 +1,7 @@
import("//webrtc.gni") import("//webrtc.gni")
if (is_android) { if (is_android) {
import("//third_party/jni_zero/jni_zero.gni")
rtc_android_apk("androidnativeapi") { rtc_android_apk("androidnativeapi") {
testonly = true testonly = true
apk_name = "androidnativeapi" apk_name = "androidnativeapi"

1
examples/androidvoip/BUILD.gn
View file

@ -9,6 +9,7 @@
import("//webrtc.gni") import("//webrtc.gni")
if (is_android) { if (is_android) {
import("//third_party/jni_zero/jni_zero.gni")
rtc_android_apk("androidvoip") { rtc_android_apk("androidvoip") {
testonly = true testonly = true
apk_name = "androidvoip" apk_name = "androidvoip"

1
sdk/android/BUILD.gn
View file

@ -9,6 +9,7 @@
if (is_android) { if (is_android) {
import("//build/config/android/config.gni") import("//build/config/android/config.gni")
import("//build/config/android/rules.gni") import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")
import("../../webrtc.gni") import("../../webrtc.gni")
group("android") { group("android") {

21
sdk/objc/unittests/RTCAudioSessionTest.mm
View file

@ -212,19 +212,8 @@
EXPECT_EQ(0, audioSession.activationCount); EXPECT_EQ(0, audioSession.activationCount);
} }
// Hack - fixes OCMVerify link error // TODO(b/298960678): Fix crash when running the test on simulators.
// Link error is: Undefined symbols for architecture i386: - (void)DISABLED_testConfigureWebRTCSession {
// "OCMMakeLocation(objc_object*, char const*, int)", referenced from:
// -[RTCAudioSessionTest testConfigureWebRTCSession] in RTCAudioSessionTest.o
// ld: symbol(s) not found for architecture i386
// REASON: https://github.com/erikdoe/ocmock/issues/238
OCMLocation *OCMMakeLocation(id testCase, const char *fileCString, int line){
return [OCMLocation locationWithTestCase:testCase
file:[NSString stringWithUTF8String:fileCString]
line:line];
}
- (void)testConfigureWebRTCSession {
NSError *error = nil; NSError *error = nil;
void (^setActiveBlock)(NSInvocation *invocation) = ^(NSInvocation *invocation) { void (^setActiveBlock)(NSInvocation *invocation) = ^(NSInvocation *invocation) {
@ -264,15 +253,19 @@ OCMLocation *OCMMakeLocation(id testCase, const char *fileCString, int line){
EXPECT_EQ(NO, [mockAVAudioSession setActive:YES withOptions:0 error:&error]); EXPECT_EQ(NO, [mockAVAudioSession setActive:YES withOptions:0 error:&error]);
[audioSession unlockForConfiguration]; [audioSession unlockForConfiguration];
// The -Wunused-value is a workaround for https://bugs.llvm.org/show_bug.cgi?id=45245
_Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wunused-value\"");
OCMVerify([mockAudioSession session]); OCMVerify([mockAudioSession session]);
OCMVerify([[mockAVAudioSession ignoringNonObjectArgs] setActive:YES withOptions:0 error:&error]); OCMVerify([[mockAVAudioSession ignoringNonObjectArgs] setActive:YES withOptions:0 error:&error]);
OCMVerify([[mockAVAudioSession ignoringNonObjectArgs] setActive:NO withOptions:0 error:&error]); OCMVerify([[mockAVAudioSession ignoringNonObjectArgs] setActive:NO withOptions:0 error:&error]);
_Pragma("clang diagnostic pop");
[mockAVAudioSession stopMocking]; [mockAVAudioSession stopMocking];
[mockAudioSession stopMocking]; [mockAudioSession stopMocking];
} }
- (void)testConfigureWebRTCSessionWithoutLocking { // TODO(b/298960678): Fix crash when running the test on simulators.
- (void)DISABLED_testConfigureWebRTCSessionWithoutLocking {
NSError *error = nil; NSError *error = nil;
id mockAVAudioSession = OCMPartialMock([AVAudioSession sharedInstance]); id mockAVAudioSession = OCMPartialMock([AVAudioSession sharedInstance]);

5
sdk/objc/unittests/RTCMTLVideoView_xctest.m
View file

@ -282,7 +282,8 @@ static size_t kBufferHeight = 200;
OCMVerifyAllWithDelay(delegateMock, 1); OCMVerifyAllWithDelay(delegateMock, 1);
} }
- (void)testSetContentMode { // TODO(b/298960678): Fix test expectations.
- (void)DISABLED_testSetContentMode {
OCMStub([self.classMock isMetalAvailable]).andReturn(YES); OCMStub([self.classMock isMetalAvailable]).andReturn(YES);
id metalKitView = OCMClassMock([MTKView class]); id metalKitView = OCMClassMock([MTKView class]);
[[[[self.classMock stub] ignoringNonObjectArgs] andReturn:metalKitView] [[[[self.classMock stub] ignoringNonObjectArgs] andReturn:metalKitView]
@ -292,7 +293,7 @@ static size_t kBufferHeight = 200;
RTC_OBJC_TYPE(RTCMTLVideoView) *realView = [[RTC_OBJC_TYPE(RTCMTLVideoView) alloc] init]; RTC_OBJC_TYPE(RTCMTLVideoView) *realView = [[RTC_OBJC_TYPE(RTCMTLVideoView) alloc] init];
[realView setVideoContentMode:UIViewContentModeScaleAspectFill]; [realView setVideoContentMode:UIViewContentModeScaleAspectFill];
OCMVerify(metalKitView); OCMVerifyAll(metalKitView);
} }
@end @end