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 76.0.3809.132 to Chromium 77.0.3865.65 (0.70.x) #5991

Merged
merged 2 commits into from
Sep 17, 2019
Merged

Upgrade from Chromium 76.0.3809.132 to Chromium 77.0.3865.65 (0.70.x) #5991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1441e3a
Merge pull request #5896 from brave/77.0.3865.65
bsclifton Sep 6, 2019
ed85870
Merge pull request #5972 from brave/maxk-fix-lint-script
mkarolin Sep 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ Config.prototype.buildArgs = function () {
if (this.targetOS === 'android') {
args.target_os = 'android'
if (!this.officialBuild) {
args.manifest_package = 'com.brave.browser_default'
args.chrome_public_manifest_package = 'com.brave.browser_default'
} else {
args.manifest_package = 'com.brave.browser'
args.chrome_public_manifest_package = 'com.brave.browser'
}

// TODO(fixme)
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "76.0.3809.132",
"tag": "77.0.3865.65",
"repository": {
"url": "https://chromium.googlesource.com/chromium/src.git"
},
Expand Down
5 changes: 1 addition & 4 deletions scripts/lint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import git_cl
import git_common
import auth

def main(args):
"""Runs cpplint on the current changelist."""
Expand All @@ -29,9 +28,7 @@ def main(args):
help='Comma-separated list of cpplint\'s category-filters')
parser.add_option('--project_root')
parser.add_option('--base_branch')
auth.add_auth_options(parser)
options, args = parser.parse_args(args)
auth_config = auth.extract_auth_config_from_options(options)

# Access to a protected member _XX of a client class
# pylint: disable=protected-access
Expand All @@ -48,7 +45,7 @@ def main(args):
previous_cwd = os.getcwd()
os.chdir(settings.GetRoot())
try:
cl = git_cl.Changelist(auth_config=auth_config)
cl = git_cl.Changelist()
change = cl.GetChange(git_common.get_or_create_merge_base(cl.GetBranch(), options.base_branch), None)
files = [f.LocalPath() for f in change.AffectedFiles()]
if not files:
Expand Down