diff --git a/lib/config.js b/lib/config.js index d1cd93288c..c230db5d96 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') { @@ -297,6 +296,8 @@ 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 + delete args.webcompat_report_api_endpoint } if (process.platform === 'win32') { 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) { 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] diff --git a/package.json b/package.json index 89967b6776..3544bdf81e 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" }, @@ -45,7 +45,7 @@ }, "brave-core": { "dir": "src/brave", - "branch": "master", + "branch": "cr83", "repository": { "url": "https://github.com/brave/brave-core.git" }