Closed Bug 1775143 Opened 3 years ago Closed 3 years ago

Update libwebrtc's build import

Tracking

()

Status:

RESOLVED FIXED

People

(Reporter: mjf, Assigned: mjf)

References

Details

Attachments

(18 files, 2 obsolete files)

Bug 1775143 - pt1 - vendor third_party/libwebrtc/build (ae8cb5d4efe8bc041196969ae336da06e263d0e9) r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt2 - Rollup of various patches to third_party/libwebrtc/build r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt1 - vendor third_party/libwebrtc/build (ae8cb5d4efe8bc041196969ae336da06e263d0e9) r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt2 - apply reconciling patch to match previous import r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt3 - (mirror) 127ace4d8887 r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt4 - (mirror) 9314046d89eb r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt5 - (mirror) 1a29be9439c1 r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt6 - (mirror) 85b5cef7ef21 r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt7 - (mirror) a62f6186e9d6 r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt8 - (mirror) dc3478ddac7c r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt9 - (mirror) 8b33eb369e9e r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt10 - (mirror) a26d44969a83 r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt11 - (mirror) 10bf2e8788d8 r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt12 - (mirror) 0391681090bb r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt13 - (mirror) 1c42d3204891 r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt14 - (mirror) 58f47eacaf10 r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt15 - (mirror) 0300b32b7de7 r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt16 - (mirror) 65d11ae74c1e r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt17 - account for is_desktop_linux going away and using is_linux r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review
Bug 1775143 - pt18 - (mirror) (cherry-pick) glandium's D149205.patch r?ng! 3 years ago Michael Froman [:mjf] 48 bytes, text/x-phabricator-request		Details \| Review

Michael Froman [:mjf]

Assignee

Description

•

3 years ago

This is specifically to support upstream commit ef4d0b6c7a4ab2ac4b460c79af3cf858cd6acbb5 which references Ozone build files.

Michael Froman [:mjf]

Assignee

Updated

•

3 years ago

Assignee: nobody → mfroman

Blocks: libwebrtc-fast-forward

Michael Froman [:mjf]

Assignee

Comment 1

•

3 years ago

Attached file Bug 1775143 - pt1 - vendor third_party/libwebrtc/build (ae8cb5d4efe8bc041196969ae336da06e263d0e9) r?ng! — Details

Michael Froman [:mjf]

Assignee

Comment 2

•

3 years ago

Attached file Bug 1775143 - pt2 - Rollup of various patches to third_party/libwebrtc/build r?ng! (obsolete) — Details

127ace4d8887 - Bug 1654112 - Tweak upstream gn files for Firefox build.
9314046d89eb - Bug 1654112 - Get OS X build working.
1a29be9439c1 - Bug 1654112 - Add the last committime file from WebRTC for GN
85b5cef7ef21 - Bug 1654112 - Add check for mozilla build that was in the previous import, restore changes
a62f6186e9d6 - Bug 1654112 - don't look for windows tools whose values will be ignored anyway
dc3478ddac7c - Bug 1654112 - Do not set _DEBUG explicitly on Windows
8b33eb369e9e - Bug 1654112 - Revert NTDDI to version known by win-2012 build machines
a26d44969a83 - Bug 1654112 - don't use libatomic on linux builds.
10bf2e8788d8 - Bug 1654112 - Mirror Bug 1719115 - Add riscv64 defines to build/build_config.h.
0391681090bb - Bug 1654112 - do not copy VS dlls durring webrtc gn generate
1c42d3204891 - Bug 1654112 - alter current cpu for win arm
58f47eacaf10 - Bug 1654112 - deconflate the target and host architectures in libwebrtc build files
Search third_party/libwebrtc/build for current_cpu, removing
third_party/libwebrtc/build/config/BUILDCONFIG.gn
and
third_party/libwebrtc/build/config/v8_target_cpu.gni from the list.

ack -lw current_cpu third_party/libwebrtc/build | grep -v "BUILDCONFIG\.gn" | grep -v "v8_target_cpu\.gni"

That gave me this:
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/win/message_compiler.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/win/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/win/midl.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/win/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/nacl/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/ios/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/linux/unbundle/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/linux/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/cros/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/android/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/aix/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/gcc_toolchain.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/mac/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/fuchsia/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/linux/extract_symbols.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/compiler/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/compiler/compiler.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/arm.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/win/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/nacl/config.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/nacl/rules.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/nacl/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/sysroot.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/ios/config.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/ios/rules.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/ios/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/linux/pkg_config.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/linux/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/chromecast/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/android/abi.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/android/config.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/android/rules.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/android/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/sanitizers/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/sanitizers/sanitizers.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/v8_target_cpu.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/x64.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/mac/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/rust.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/mips.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/posix/BUILD.gn

0300b32b7de7 - Bug 1654448 - P2 - readd partial support for BSD to webrtc build
Also account for is_desktop_linux removal (and change to is_linux usage)
65d11ae74c1e - Bug 1746140 - Add SPARC defines to third_party/libwebrtc/build/build_config.h
(cherry-pick) glandium's D149205.patch

Depends on D149807

Michael Froman [:mjf]

Assignee

Comment 3

•

3 years ago

Attached file Bug 1775143 - pt1 - vendor third_party/libwebrtc/build (ae8cb5d4efe8bc041196969ae336da06e263d0e9) r?ng! (obsolete) — Details

Phabricator Automation

Updated

•

3 years ago

Attachment #9282105 - Attachment is obsolete: true

Michael Froman [:mjf]

Assignee

Comment 4

•

3 years ago

Attached file Bug 1775143 - pt2 - apply reconciling patch to match previous import r?ng! — Details

tl;dr We commit extra changes when we vendored this for the v86 import,
so we need to do the equivalent here again. For more info see:
https://wiki.mozilla.org/Media/WebRTC/libwebrtc_Update_Process/automation_plan#verify_current_vendoring_scripts_cmd-line_params
and
https://wiki.mozilla.org/File:Vendor-build-fixup.patch.zip

Depends on D149807

Michael Froman [:mjf]

Assignee

Comment 5

•

3 years ago

Attached file Bug 1775143 - pt3 - (mirror) 127ace4d8887 r?ng! — Details

Depends on D149816

Michael Froman [:mjf]

Assignee

Comment 6

•

3 years ago

Attached file Bug 1775143 - pt4 - (mirror) 9314046d89eb r?ng! — Details

Depends on D149817

Michael Froman [:mjf]

Assignee

Comment 7

•

3 years ago

Attached file Bug 1775143 - pt5 - (mirror) 1a29be9439c1 r?ng! — Details

Depends on D149818

Michael Froman [:mjf]

Assignee

Comment 8

•

3 years ago

Attached file Bug 1775143 - pt6 - (mirror) 85b5cef7ef21 r?ng! — Details

Depends on D149819

Michael Froman [:mjf]

Assignee

Comment 9

•

3 years ago

Attached file Bug 1775143 - pt7 - (mirror) a62f6186e9d6 r?ng! — Details

Depends on D149820

Michael Froman [:mjf]

Assignee

Comment 10

•

3 years ago

Attached file Bug 1775143 - pt8 - (mirror) dc3478ddac7c r?ng! — Details

Depends on D149821

Michael Froman [:mjf]

Assignee

Comment 11

•

3 years ago

Attached file Bug 1775143 - pt9 - (mirror) 8b33eb369e9e r?ng! — Details

Depends on D149822

Michael Froman [:mjf]

Assignee

Comment 12

•

3 years ago

Attached file Bug 1775143 - pt10 - (mirror) a26d44969a83 r?ng! — Details

Depends on D149823

Michael Froman [:mjf]

Assignee

Comment 13

•

3 years ago

Attached file Bug 1775143 - pt11 - (mirror) 10bf2e8788d8 r?ng! — Details

Depends on D149824

Michael Froman [:mjf]

Assignee

Comment 14

•

3 years ago

Attached file Bug 1775143 - pt12 - (mirror) 0391681090bb r?ng! — Details

Depends on D149825

Michael Froman [:mjf]

Assignee

Comment 15

•

3 years ago

Attached file Bug 1775143 - pt13 - (mirror) 1c42d3204891 r?ng! — Details

Depends on D149826

Michael Froman [:mjf]

Assignee

Comment 16

•

3 years ago

Attached file Bug 1775143 - pt14 - (mirror) 58f47eacaf10 r?ng! — Details

Search third_party/libwebrtc/build for current_cpu, removing
third_party/libwebrtc/build/config/BUILDCONFIG.gn
and
third_party/libwebrtc/build/config/v8_target_cpu.gni from the list.

ack -lw current_cpu third_party/libwebrtc/build | grep -v "BUILDCONFIG.gn" | grep -v "v8_target_cpu.gni"

That gave me this:
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/win/message_compiler.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/win/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/win/midl.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/win/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/nacl/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/ios/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/linux/unbundle/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/linux/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/cros/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/android/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/aix/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/gcc_toolchain.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/mac/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/toolchain/fuchsia/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/linux/extract_symbols.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/compiler/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/compiler/compiler.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/arm.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/win/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/nacl/config.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/nacl/rules.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/nacl/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/sysroot.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/ios/config.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/ios/rules.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/ios/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/linux/pkg_config.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/linux/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/chromecast/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/android/abi.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/android/config.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/android/rules.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/android/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/sanitizers/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/sanitizers/sanitizers.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/v8_target_cpu.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/x64.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/mac/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/rust.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/mips.gni
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/BUILD.gn
sed -i 's/current_cpu/target_cpu/g' third_party/libwebrtc/build/config/posix/BUILD.gn

Depends on D149827

Michael Froman [:mjf]

Assignee

Comment 17

•

3 years ago

Attached file Bug 1775143 - pt15 - (mirror) 0300b32b7de7 r?ng! — Details

Depends on D149828

Michael Froman [:mjf]

Assignee

Comment 18

•

3 years ago

Attached file Bug 1775143 - pt16 - (mirror) 65d11ae74c1e r?ng! — Details

Depends on D149829

Michael Froman [:mjf]

Assignee

Comment 19

•

3 years ago

Attached file Bug 1775143 - pt17 - account for is_desktop_linux going away and using is_linux r?ng! — Details

Depends on D149830

Michael Froman [:mjf]

Assignee

Comment 20

•

3 years ago

Attached file Bug 1775143 - pt18 - (mirror) (cherry-pick) glandium's D149205.patch r?ng! — Details

Depends on D149831

Michael Froman [:mjf]

Assignee

Updated

•

3 years ago

Summary: Update libwebrtc'c build import → Update libwebrtc's build import

Phabricator Automation

Updated

•

3 years ago

Attachment #9282103 - Attachment is obsolete: true

Michael Froman [:mjf]

Assignee

Updated

•

3 years ago

Status: NEW → RESOLVED

Closed: 3 years ago

Resolution: --- → FIXED

Pulsebot

Comment 21

•

3 years ago

Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)

Comment 22

•

3 years ago

bugherder

You need to log in before you can comment on or make changes to this bug.