Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade from Chromium 128 to Chromium 129 (uplift to 1.70.x). #25514

Merged
merged 8 commits into from
Sep 13, 2024

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Sep 10, 2024

Resolves brave/brave-browser#40451
Resolves brave/brave-browser#40204
Resolves brave/brave-browser#39211
Resolves brave/brave-browser#40982
Resolves brave/brave-browser#41010
Resolves brave/brave-browser#40990
Resolves brave/brave-browser#41039

Uplift from: #24966
Uplift from: #25126
Uplift from: #25526
Uplift from: #25528
Uplift from: #25522
Uplift from: #25549

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • 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 wiki
    • npm run presubmit wiki, 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:

@mkarolin mkarolin added CI/run-network-audit Run network-audit CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/run-upstream-tests Run upstream unit and browser tests on Linux and Windows (otherwise only on Linux) labels Sep 10, 2024
@mkarolin mkarolin self-assigned this Sep 10, 2024
@mkarolin mkarolin requested a review from a team as a code owner September 10, 2024 22:20
@github-actions github-actions bot added CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet feature/web3/wallet/core labels Sep 10, 2024
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

bsclifton and others added 4 commits September 11, 2024 13:14
Upgrade from Chromium 128 to Chromium 129.
Fixes official Linux release build.

The build fails with:

09:30:10  > gn gen /home/ubuntu/workspace/brave-browser-build-linux-x64-nightly/src/out/Release --check
09:30:10
 ERROR at //build/config/compiler/compiler.gni:324:3: Assertion failed.
09:30:10    assert(
09:30:10    ^-----
09:30:10  Can't do non-component builds at symbol_level=2 without use_debug_fission=true
09:30:10  See //build/config/compiler/compiler.gni:325:7:
09:30:10        symbol_level != 2 || current_toolchain != default_toolchain ||
09:30:10        ^-------------------------------------------------------------
09:30:10  This is where it was set.
09:30:10  See //BUILD.gn:13:1: whence it was imported.
09:30:10  import("//build/config/compiler/compiler.gni")

Due to Chromium change:

https://source.chromium.org/chromium/chromium/src/+/81024e91fddf6e045dcd9a8a04186c8cdbcbb4c0

commit 81024e91fddf6e045dcd9a8a04186c8cdbcbb4c0
Author: Nico Weber <thakis@chromium.org>
Date:   Thu Aug 1 02:54:08 2024 +0000

    Reland^2 "linux/build: Enable fission for (symbol_level = 2) release builds as well"

    This is a reland of commit b7da3afa43ecb6a1a4839c4f91e798a6d72b221f

    The CL got reverted for breaking android-official, and a comment
    on the original review mentioned that it also broke a few cros bots
    like arm-generic-cq.

    For the reland, this now also allows non-fission static symbol_level 2
    for android and chromeos.

    Original change's description:
    > Reland "linux/build: Enable fission for (symbol_level = 2) release builds as well"
    >
    > This is a reland of commit c031e3aa3a7a0ad71715655e140ba52ffa82a08d
    > The reland removes an assert on macOS (where is_debug_fission isn't
    > used -- darwin toolchains have always used something like fission,
    > but under a different name).
    >
    > Original change's description:
    > > linux/build: Enable fission for (symbol_level = 2) release builds as well
    > >
    > > Looks like full-symbol non-component builds are getting too big for
    > > debug info even in release builds.
    > >
    > > Turn on fission by default on linux in release builds as well.
    > >
    > > This might affect official builds, where dump_syms etc might not
    > > handle fission yet. If this is a problem, we'll have to fix this
    > > at some point, but short-term we can not do this for official
    > > builds in that case. (zequanwu@ says CrOS enabled fission already,
    > > encountered dump_syms issues, and those already got fixed.
    > > And a linux-official try run is green. We'll see!)
    > >
    > > (Component builds don't need fission yet, but for simplicity I'm
    > > enabling fission independent of is_component_build.)
    > >
    > > Bug: 353915727
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

mkarolin and others added 2 commits September 11, 2024 17:58
 ../../brave/browser/ui/brave_rewards/rewards_panel_coordinator.h:11:10: fatal error: 'brave/components/brave_rewards/common/mojom/rewards_panel.mojom.h' file not found
    11 | #include "brave/components/brave_rewards/common/mojom/rewards_panel.mojom.h"
       |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 1 error generated.
Upgrade from Chromium 129.0.6668.31 to Chromium 129.0.6668.42.
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

Chromium change:
https://source.chromium.org/chromium/chromium/src/+/e86c3572f7012a64517e54c098984c0d44afe1f6

[Android] Use SettingsLauncherFactory directly from settings Fragments

Also add SettingsLauncherFactory#setInstanceForTesting().

Clean up passing around of the SettingsLauncher to Fragments.

Low-Coverage-Reason: LARGE_SCALE_REFACTOR
Bug: 354019554
@kjozwiak kjozwiak added this to the 1.70.x - Release milestone Sep 13, 2024
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.70.x approved 👍

@kjozwiak kjozwiak merged commit 69179fc into 1.70.x Sep 13, 2024
14 of 15 checks passed
@kjozwiak kjozwiak deleted the cr129-1.70.x branch September 13, 2024 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/run-network-audit Run network-audit CI/run-upstream-tests Run upstream unit and browser tests on Linux and Windows (otherwise only on Linux) CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet/core feature/web3/wallet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants