Enable cross-compilation from Linux to Mac #13537

mherrmann · 2022-05-30T17:09:50Z

The following commands can be used to test the new implementation:

git clone [email protected]:brave/brave-browser.git
cd brave-browser
git clone [email protected]:brave/brave-core.git src/brave

... check out a revision of b-c with the changes from this PR...

npm install
npm config set target_os=mac
npm config set target_arch=x64
npm run init
npm run build -- Static

Resolves https://github.com/brave/devops/issues/7551. Depends on brave/Sparkle#19 and https://github.com/brave/devops/pull/7615.

Submitter Checklist:

I confirm that no security/privacy review is needed, or that I have requested one
There is a ticket for my issue
Used Github auto-closing keywords in the PR description above
Wrote a good PR/commit description
Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
Ran git rebase master (if needed)

Reviewer Checklist:

A security review is not needed, or a link to one is included in the PR description
New files have MPL-2.0 license header
Adequate test coverage exists to prevent regressions
Major classes, functions and non-trivial code blocks are well-commented
Changes in component dependencies are properly reflected in gn
Code follows the style guide
Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

This change could affect Brave's auto-update functionality on macOS. Please test the scenarios 1.-4. specified under "Test Plan" in #12335. It should be enough to do this on one or two macOS versions, say the most recent one and the oldest one supported by Brave.

goodov · 2022-05-31T07:01:33Z

What issue we currently have that will be solved by cross-compiling MacOS on Linux? Won't this arise another issues that we will have to deal with? Will Linux be able to compile arm64 binaries?

simonhong · 2022-05-31T10:46:01Z

With this change, sparkle will be built separatly from b-c?

mherrmann · 2022-05-31T11:56:45Z

@simonhong yes. See brave/Sparkle#19.

patches/chrome-tools-build-mac-BUILD.gn.patch

simonhong

LGTM for sparkle related changes.

mherrmann · 2022-06-02T06:30:54Z

We would like to merge this. Even if it doesn't end up getting used in CI, it speeds up builds a little and can help developers (like me) whose primary OS is Linux. @goodov @bridiver can I ask for your review?

build/mac/download_hermetic_xcode.py

patches/chrome-tools-build-mac-BUILD.gn.patch

script/download_rust_deps.py

build/commands/lib/config.js

goodov · 2022-06-03T12:50:30Z

can you pls build release builds on this branch (x64 and arm64) to make sure everything's working fine?

mherrmann · 2022-06-07T05:08:09Z

@goodov sure. There you go:

x64
arm64

goodov · 2022-06-07T05:56:31Z

@goodov sure. There you go:

x64

arm64

Thanks. Looks good. Sorry for being too picky, but Release builds don't use Goma. Can you please check that these jobs also work with USE_GOMA disabled?

mherrmann · 2022-06-07T12:37:48Z

@goodov no problem. Here are the builds without Goma:

mherrmann · 2022-06-07T13:28:16Z

@bridiver could you also review or point me to someone else who can unlock this PR?

patches/chrome-tools-build-mac-BUILD.gn.patch

mherrmann · 2022-06-20T15:54:23Z

@brave/sec-team we are downloading two new Rust dependencies as part of Brave's build process. There are already several others which we are downloading. Do we need a security review for this?

(This was raised by @bridiver.)

Previous commits decoupled it from this repository, instead building its binaries in CI. However, this goes against our recent push to keep all necessary code in this repository. This commit therefore adds Sparkle back. The implementation still pulls pre-built binaries from CI by default. However, it now also supports building locally. This is then used by CI to generate the pre-built binaries.

This adds the necessary ninja dependencies for: npm run build Static -- \ --build_sparkle --target=brave/vendor/sparkle:tar_sparkle_binaries

It can be passed to `npm run build` via `--gn`.

mherrmann · 2022-07-07T17:04:40Z

Just a quick update that I would merge this but there have been CI problems with Windows and I want a green build before merging. I expect to get it and merge after my PTO next week.

mherrmann added the release-notes/exclude label May 30, 2022

mherrmann requested review from a team and bridiver as code owners May 30, 2022 17:09

mherrmann self-assigned this May 30, 2022

mherrmann force-pushed the enable-cross-compilation-linux-to-mac branch from ee220ce to f647e8c Compare May 30, 2022 17:13

mihaiplesa requested review from simonhong and goodov May 30, 2022 17:20

mherrmann force-pushed the enable-cross-compilation-linux-to-mac branch from f647e8c to 0f2b97d Compare May 31, 2022 06:18

goodov reviewed Jun 1, 2022

View reviewed changes

patches/chrome-tools-build-mac-BUILD.gn.patch Outdated Show resolved Hide resolved

simonhong previously approved these changes Jun 2, 2022

View reviewed changes

goodov reviewed Jun 2, 2022

View reviewed changes

build/mac/download_hermetic_xcode.py Outdated Show resolved Hide resolved

patches/chrome-tools-build-mac-BUILD.gn.patch Outdated Show resolved Hide resolved

script/download_rust_deps.py Outdated Show resolved Hide resolved

build/commands/lib/config.js Outdated Show resolved Hide resolved

mherrmann force-pushed the enable-cross-compilation-linux-to-mac branch from ab80c3b to a1bb2ad Compare June 2, 2022 15:01

mherrmann added the QA/No label Jun 2, 2022

mherrmann force-pushed the enable-cross-compilation-linux-to-mac branch 2 times, most recently from 5a4ea3b to 1d6124b Compare June 3, 2022 09:02

mherrmann force-pushed the enable-cross-compilation-linux-to-mac branch from 1d6124b to 0be98bf Compare June 6, 2022 14:01

goodov previously approved these changes Jun 7, 2022

View reviewed changes

mherrmann force-pushed the enable-cross-compilation-linux-to-mac branch from 0be98bf to c5e05e0 Compare June 15, 2022 08:44

bridiver reviewed Jun 20, 2022

View reviewed changes

patches/chrome-tools-build-mac-BUILD.gn.patch Show resolved Hide resolved

mherrmann added 23 commits July 7, 2022 09:31

Simplify patch

62182a2

Update dependency Sparkle

aefd105

Fix build error when cross-compiling Linux -> Mac

db9a311

Update DEP Sparkle to 1.24.1

109dc09

Make it possible to compile Sparkle locally

dd37fa7

Temporarily compile Sparkle locally to test on CI

dc83f82

Fix dependency resolution error

11ae20e

Update DEP Sparkle

90ec686

Update DEP Sparkle

0042d20

Update DEP Sparkle to 1.24.2

964abbe

Switch back to using pre-compiled Sparkle

4086c34

Disable use of pre-built Sparkle for debugging

ee7f3c9

Add npm build argument --build_sparkle

636020c

This adds the necessary ninja dependencies for: npm run build Static -- \ --build_sparkle --target=brave/vendor/sparkle:tar_sparkle_binaries

Fix broken npm run build ... -- --build_sparkle

18d3ae5

Update DEP Sparkle

76a7869

Update Sparkle pre-built binary URL

f253b67

Update DEP Sparkle

7a842e9

Remove build_sparkle param from build scripts

9e65aae

It can be passed to `npm run build` via `--gn`.

Simplify if condition in config.js

972dbbd

Fix & simplify target OS conditionals in config.js

a68546d

Add {} for one-line if to comply with JS standard

95bf4fd

Refactor: Group some related code blocks

3794fa2

mherrmann force-pushed the enable-cross-compilation-linux-to-mac branch from 8681617 to 3794fa2 Compare July 7, 2022 07:31

mihaiplesa merged commit 32ff5ab into master Jul 7, 2022

mihaiplesa deleted the enable-cross-compilation-linux-to-mac branch July 7, 2022 20:28

github-actions bot added this to the 1.43.x - Nightly milestone Jul 7, 2022

mherrmann mentioned this pull request Jan 4, 2023

Cross-compiling from Linux to macOS does not create symlinks brave/brave-browser#27633

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable cross-compilation from Linux to Mac #13537

Enable cross-compilation from Linux to Mac #13537

mherrmann commented May 30, 2022 •

edited

Loading

goodov commented May 31, 2022

simonhong commented May 31, 2022 •

edited

Loading

mherrmann commented May 31, 2022

simonhong left a comment

mherrmann commented Jun 2, 2022 •

edited

Loading

goodov commented Jun 3, 2022 •

edited

Loading

mherrmann commented Jun 7, 2022

goodov commented Jun 7, 2022

mherrmann commented Jun 7, 2022 •

edited

Loading

mherrmann commented Jun 7, 2022

mherrmann commented Jun 20, 2022

mherrmann commented Jul 7, 2022

Enable cross-compilation from Linux to Mac #13537

Enable cross-compilation from Linux to Mac #13537

Conversation

mherrmann commented May 30, 2022 • edited Loading

Submitter Checklist:

Reviewer Checklist:

After-merge Checklist:

Test Plan:

goodov commented May 31, 2022

simonhong commented May 31, 2022 • edited Loading

mherrmann commented May 31, 2022

simonhong left a comment

Choose a reason for hiding this comment

mherrmann commented Jun 2, 2022 • edited Loading

goodov commented Jun 3, 2022 • edited Loading

mherrmann commented Jun 7, 2022

goodov commented Jun 7, 2022

mherrmann commented Jun 7, 2022 • edited Loading

mherrmann commented Jun 7, 2022

mherrmann commented Jun 20, 2022

mherrmann commented Jul 7, 2022

mherrmann commented May 30, 2022 •

edited

Loading

simonhong commented May 31, 2022 •

edited

Loading

mherrmann commented Jun 2, 2022 •

edited

Loading

goodov commented Jun 3, 2022 •

edited

Loading

mherrmann commented Jun 7, 2022 •

edited

Loading