From 5998f548f5fcec0854cda26fe6a02e023c1ecf81 Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Wed, 24 Jul 2019 14:17:45 -0400 Subject: [PATCH 1/3] Upgrade from Chromium 76.0.3809.132 to Chromium 77.0.3865.56 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bbcc6c214c..d61c8bf562 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "76.0.3809.132", + "tag": "77.0.3865.56", "repository": { "url": "https://chromium.googlesource.com/chromium/src.git" }, From df87dee373d46792a60448d9bba1f20a8128ac0d Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Wed, 4 Sep 2019 13:44:17 -0400 Subject: [PATCH 2/3] Changed config var name for Android build. manifest_package is now chrome_public_manifest_package. Chromium change: https://chromium.googlesource.com/chromium/src/+/5172118ff57bef7dd2864c9fe891db9c05f76a2b commit 5172118ff57bef7dd2864c9fe891db9c05f76a2b Author: Tibor Goldschwendt Date: Mon Jun 24 21:57:47 2019 +0000 [build] Add ability to define manifest package in GN The build system will verify that the manifest packages match if you specify it in both GN and the manifest. Bug: 891996 --- lib/config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/config.js b/lib/config.js index 7a58e6dfd0..5a55ed85bb 100755 --- a/lib/config.js +++ b/lib/config.js @@ -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) From 9b5cca603fbdf7231caad9fc389acfdf6090670f Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Wed, 7 Aug 2019 17:34:05 -0400 Subject: [PATCH 3/3] Pin b-c branch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d61c8bf562..c06610c689 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ }, "brave-core": { "dir": "src/brave", - "branch": "master", + "branch": "77.0.3865.56", "repository": { "url": "https://github.com/brave/brave-core.git" }