From 52d6e0ed2ff8e61bd5a2a718169e0cfb4d0c97c8 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 26 Mar 2020 17:48:08 -0400 Subject: [PATCH 1/7] Upgrade from Chromium 81.0.4044.138 to Chromium 83.0.4103.56. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 89967b6776..8644d2443f 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "81.0.4044.138", + "tag": "83.0.4103.56", "repository": { "url": "https://github.com/chromium/chromium" }, From 174f480ce8a6846e10e349babf0f939e0d886cfc Mon Sep 17 00:00:00 2001 From: mkarolin Date: Fri, 3 Apr 2020 17:45:40 -0400 Subject: [PATCH 2/7] is_win_fastlink build arg was removed. Chromium change: https://chromium.googlesource.com/chromium/src/+/108dc9210ea25e593ad8139763ee1e1665752f96 commit 108dc9210ea25e593ad8139763ee1e1665752f96 Author: Nico Weber Date: Tue Feb 25 17:25:32 2020 +0000 win: Remove is_win_fastlink arg. It only has an effect when not using clang and lld, and the default build setup is to use clang and lld. Also, goma has dropped support for non-clang compiles, and a main use case for is_win_fastlink was being able to use goma. Finally, is_win_fastlink never worked well. Bug: 1053958 --- lib/config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/config.js b/lib/config.js index d1cd93288c..f8948d5250 100755 --- a/lib/config.js +++ b/lib/config.js @@ -201,7 +201,6 @@ Config.prototype.buildArgs = function () { } args.symbol_level = 2 args.enable_profiling = true - args.is_win_fastlink = true } if (this.sccache && process.platform === 'win32') { From eaddccbe9ee1089dec1734d130f6eabcb875266d Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 26 Mar 2020 17:48:40 -0400 Subject: [PATCH 3/7] Pin b-c branch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8644d2443f..3544bdf81e 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ }, "brave-core": { "dir": "src/brave", - "branch": "master", + "branch": "cr83", "repository": { "url": "https://github.com/brave/brave-core.git" } From 73ef04fb5c9bbb92669169cceddf6559a6622b24 Mon Sep 17 00:00:00 2001 From: samartnik Date: Thu, 7 May 2020 14:22:37 -0400 Subject: [PATCH 4/7] [Android] Fix for dark mode colors --- lib/util.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/util.js b/lib/util.js index d1ef5b447e..43aa105f08 100755 --- a/lib/util.js +++ b/lib/util.js @@ -309,8 +309,6 @@ const util = { const androidIconDest = path.join(config.srcDir, 'chrome', 'android', 'java', 'res_chromium') const androidResSource = path.join(config.projects['brave-core'].dir, 'android', 'java', 'res') const androidResDest = path.join(config.srcDir, 'chrome', 'android', 'java', 'res') - const androidResNightSource = path.join(config.projects['brave-core'].dir, 'android', 'java', 'res_night') - const androidResNightDest = path.join(config.srcDir, 'chrome', 'android', 'java', 'res_night') const androidNtpTilesResSource = path.join(config.projects['brave-core'].dir, 'components', 'ntp_tiles', 'resources') const androidNtpTilesResDest = path.join(config.srcDir, 'components', 'ntp_tiles', 'resources') const androidResTemplateSource = path.join(config.projects['brave-core'].dir, 'android', 'java', 'res_template') @@ -322,7 +320,6 @@ const util = { const copyAndroidResourceMapping = { [androidIconSource]: [androidIconDest], [androidResSource]: [androidResDest], - [androidResNightSource]: [androidResNightDest], [androidNtpTilesResSource]: [androidNtpTilesResDest], [androidResTemplateSource]: [androidResTemplateDest], [androidContentPublicResSource]: [androidContentPublicResDest] From f8d223508af6af1f3d77af3a8c6350843e2be0c7 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 7 May 2020 16:16:35 -0400 Subject: [PATCH 5/7] Split rewards/ads unit tests into a separate suite. When all unit test are in the same suite, all the -D and -I add up to a command line that is too long on Windows. --- lib/test.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lib/test.js b/lib/test.js index 9899e143c9..f3c1adea06 100644 --- a/lib/test.js +++ b/lib/test.js @@ -39,6 +39,11 @@ const test = (suite, buildConfig = config.defaultBuildConfig, options) => { // Build the tests util.run('ninja', ['-C', config.outputDir, suite], config.defaultOptions) + const run_brave_rewards_unitests = suite === 'brave_unit_tests' && config.targetOS !== 'ios' + if (run_brave_rewards_unitests) { + util.run('ninja', ['-C', config.outputDir, 'brave_rewards_unit_tests'], config.defaultOptions) + } + const run_brave_installer_unitests = suite === 'brave_unit_tests' && config.targetOS !== 'android' if (run_brave_installer_unitests) { util.run('ninja', ['-C', config.outputDir, 'brave_installer_unittests'], config.defaultOptions) @@ -60,18 +65,31 @@ const test = (suite, buildConfig = config.defaultBuildConfig, options) => { util.run('ninja', ['-C', config.outputDir, "fix_brave_test_install_name_speedreader"], config.defaultOptions) let testBinary; + let rewardsTestBinary; let installerTestBinary; if (process.platform === 'win32') { testBinary = `${suite}.exe` + rewardsTestBinary = 'brave_rewards_unit_tests.exe' installerTestBinary = 'brave_installer_unittests.exe' } else { testBinary = suite + rewardsTestBinary = 'brave_rewards_unit_tests' installerTestBinary = 'brave_installer_unittests' } // Run the tests util.run(path.join(config.outputDir, testBinary), braveArgs, config.defaultOptions) + if (run_brave_rewards_unitests) { + // Replace output file arguments + if (options.output) { + braveArgs.splice(braveArgs.indexOf('--gtest_output=xml:' + options.output, 1)) + braveArgs.push('--gtest_output=xml:brave_rewards_unit_tests.xml') + } + + util.run(path.join(config.outputDir, rewardsTestBinary), braveArgs, config.defaultOptions) + } + if (run_brave_installer_unitests) { // Replace output file arguments if (options.output) { From 667669e9d08ffc0491aa3cb7562ea40ece61e80a Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 13 May 2020 14:05:00 -0400 Subject: [PATCH 6/7] iOS doesn't use brave_services_key. --- lib/config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/config.js b/lib/config.js index f8948d5250..a9cf8c52dd 100755 --- a/lib/config.js +++ b/lib/config.js @@ -296,6 +296,7 @@ Config.prototype.buildArgs = function () { delete args.brave_referrals_api_key delete args.brave_infura_project_id delete args.binance_client_id + delete args.brave_services_key } if (process.platform === 'win32') { From 97bce8cbc06ff5aff20ccb51c199a056a9de762f Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Thu, 14 May 2020 17:37:51 -0400 Subject: [PATCH 7/7] iOS doesn't use webcompat_report_api_endpoint. --- lib/config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/config.js b/lib/config.js index a9cf8c52dd..c230db5d96 100755 --- a/lib/config.js +++ b/lib/config.js @@ -297,6 +297,7 @@ Config.prototype.buildArgs = function () { delete args.brave_infura_project_id delete args.binance_client_id delete args.brave_services_key + delete args.webcompat_report_api_endpoint } if (process.platform === 'win32') {