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.

Sign up for GitHub

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

Jump to bottom

Upgrade from Chromium 80.0.3987.163 to Chromium 81.0.4044.92 (1.7.x) #5204

Merged
merged 13 commits into from
Apr 15, 2020
Merged

Upgrade from Chromium 80.0.3987.163 to Chromium 81.0.4044.92 (1.7.x) #5204

merged 13 commits into from
Apr 15, 2020

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Apr 8, 2020 •
edited
Loading

Fixes brave/brave-browser#8308
Fixes brave/brave-browser#8342
Fixes brave/brave-browser#8808
Fixes brave/brave-browser#8870
Fixes brave/brave-browser#8878
Fixes brave/brave-browser#8893
Fixes brave/brave-browser#9000

Related PR: brave/brave-browser#9103

Uplift from #4548
Uplift from #5018
Uplift from #5074
Uplift from #5075
Uplift from #5089
Uplift from #5150

Submitter Checklist:

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

@mkarolin mkarolin added the CI/run-network-audit Run network-audit label Apr 8, 2020
@mkarolin mkarolin added this to the 1.7.x - Release milestone Apr 8, 2020
@mkarolin mkarolin self-assigned this Apr 8, 2020
@mkarolin mkarolin mentioned this pull request Apr 8, 2020
Merged
29 tasks
bsclifton and others added 11 commits April 13, 2020 15:06
@bsclifton
Merge pull request #4548 from brave/cr81
95ddb2e 
Upgrade from Chromium 80.0.3987.149 to Chromium 81.0.4044.69.
@bsclifton
Merge pull request #5018 from brave/fix_import_crash_from_welcome_ui
1ce6282 
Fixed crash while importing from welcome ui
@mkarolin @bsclifton
Merge pull request #5074 from brave/maxk-issue-8870
5c306f3 
Fixes Clear Browsing Data dialog not showing.
@bsclifton
Merge pull request #5075 from brave/81.0.4044.83
0bbef24 
Update patches from Chromium 81.0.4044.69 to Chromium 81.0.4044.83.
@bsclifton
Merge pull request #5089 from brave/cr81-l10n
33141ca 
L10n for Chromium 81.
@bsclifton
Merge pull request #5150 from brave/81.0.4044.92_master_35
049273f 
Upgrade patches from Chromium 81.0.4044.83 to Chromium 81.0.4044.92
@mkarolin @bsclifton
Fixes ChromeActivity.java patch.
2a2f6d2 
Chromium change:

https://chromium.googlesource.com/chromium/src/+/91ac1e4597667f679f99a9c58ada806b0c5c19b1

commit 91ac1e4597667f679f99a9c58ada806b0c5c19b1
Author: Andrew Grieve <[email protected]>
Date:   Tue Mar 3 18:11:17 2020 +0000

    Android: Speculative crash fix for DelayedScreenLockIntentHandler

    Stack is:
    Caused by: android.util.AndroidRuntimeException: Calling startActivity() from outside of an Activity  context requires the FLAG_ACTIVITY_NEW_TASK flag. Is this really what you want?
      at android.app.ContextImpl.startActivity      (ContextImpl.java: 952)
      at android.content.ContextWrapper.startActivity       (ContextWrapper.java: 405)
      at org.chromium.chrome.browser.ChromeApplication.startActivity        (ChromeApplication.java: 206)
      at org.chromium.chrome.browser.ChromeApplication.startActivity        (ChromeApplication.java: 199)
      at org.chromium.chrome.browser.DelayedScreenLockIntentHandler.onReceive       (DelayedScreenLockIntentHandler.java: 40)
      at android.app.LoadedApk$ReceiverDispatcher$Args.lambda$getRunnable$0$LoadedApk$ReceiverDispatcher$Args       (LoadedApk.java: 1550)
      ...

    From history on DelayedScreenLockIntentHandler, repro steps involve
    launching a page via NFC while locked.

    This restriction is listed as a new one in Android P:
    https://developer.android.com/about/versions/pie/android-9.0-changes-all#fant-required

    Bug: 1034440
@mkarolin @bsclifton
Patches updates.
6b70b70
@mkarolin @bsclifton
extensions::UnloadedExtensionReason has moved.
ca46fd1 
Chromium change:

https://chromium.googlesource.com/chromium/src/+/c9c4efe552830789d8602271c43c47830c8f2753

commit c9c4efe552830789d8602271c43c47830c8f2753
Author: Devlin Cronin <[email protected]>
Date:   Tue Jan 7 21:04:05 2020 +0000

    [Extensions Cleanup] Move UnloadedExtensionReason to a new file

    Move the UnloadedExtensionReason enum to a new file,
    unloaded_extension_reason.h. There's no reason it needs to belong in
    extension.h, which is already quite large.

    Bug: 1038392
@mkarolin @bsclifton
Use base::Value::Append for lists.
d2c7c9b 
In addition to the same change on master (the affected code is not on
master):
5495918
@mkarolin @bsclifton
PermissionRequestType moved to //components.
62310cd 
Same as this change in master:
24f70b8
@bsclifton bsclifton force-pushed the 81.0.4044.92-1.7.x branch from 817c1da to 62310cd Compare April 13, 2020 22:07
@bsclifton
Copy link
Member

CI run looks great, except on Android; there was a problem during build for Android:
https://ci.brave.com/job/brave-browser-build-pr/job/PR-9103/3/execution/node/383/log/

15:29:50  ERROR at //components/sync/android/BUILD.gn:35:3: Undefined identifier.
15:29:50    java_files += brave_sync_java_sources
15:29:50    ^---------
15:29:50  See //build/config/android/internal_rules.gni:163:23: which caused the file to be included.
15:29:50              deps += [ "$_target_label$build_config_target_suffix" ]
15:29:50                        ^------------------------------------------

Going to rebase/re-run (both brave-core and brave-browser branches) as there have been some Android related CI items that have landed

@bsclifton bsclifton added CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Apr 14, 2020
@bsclifton
Copy link
Member

Re-run got the same error... will need to look at this

@bsclifton
Copy link
Member

bsclifton commented Apr 14, 2020 •
edited
Loading

Fix pushed for Android 😄 Thanks @SergeyZhukovsky for the help finding root cause

bsclifton
bsclifton approved these changes Apr 15, 2020
View reviewed changes
Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

++

@bsclifton bsclifton merged commit 2822d1b into 1.7.x Apr 15, 2020
@bsclifton bsclifton deleted the 81.0.4044.92-1.7.x branch April 15, 2020 00:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bsclifton bsclifton bsclifton approved these changes

@bbondy bbondy Awaiting requested review from bbondy bbondy is a code owner

@bridiver bridiver Awaiting requested review from bridiver bridiver is a code owner

@iefremov iefremov Awaiting requested review from iefremov iefremov is a code owner

@NejcZdovc NejcZdovc Awaiting requested review from NejcZdovc

@ryanml ryanml Awaiting requested review from ryanml

@simonhong simonhong Awaiting requested review from simonhong simonhong is a code owner

@tmancey tmancey Awaiting requested review from tmancey tmancey is a code owner

Assignees

@mkarolin mkarolin

Labels
CI/run-network-audit Run network-audit CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Milestone
1.7.x - Release Hotfix 1
Development

Successfully merging this pull request may close these issues.
2 participants
@mkarolin @bsclifton