diff --git a/build/commands/lib/buildChromiumRelease.js b/build/commands/lib/buildChromiumRelease.js index a07a8eb6cfb..8e66c43de14 100644 --- a/build/commands/lib/buildChromiumRelease.js +++ b/build/commands/lib/buildChromiumRelease.js @@ -163,7 +163,7 @@ function buildChromiumRelease(buildOptions = {}) { } depotTools.installDepotTools() - syncUtil.writeRootGclientFile([config.targetOS], [config.targetArch], true) + syncUtil.writeGclientConfig([config.targetOS], [config.targetArch], true) util.runGit(config.srcDir, ['clean', '-f', '-d']) diff --git a/build/commands/lib/config.js b/build/commands/lib/config.js index 1c1b7126b59..62db54a6067 100644 --- a/build/commands/lib/config.js +++ b/build/commands/lib/config.js @@ -178,8 +178,7 @@ const Config = function () { 'repository', 'url', ]) - this.rootGclientFile = path.join(this.rootDir, '.gclient') - this.gclientFile = process.env.BRAVE_GCLIENT_FILE || this.rootGclientFile + this.gclientFile = path.join(this.rootDir, '.gclient') this.gclientVerbose = getEnvConfig(['gclient_verbose']) || false this.gclientCustomDeps = getEnvConfig(['gclient_custom_deps'], {}) this.gclientCustomVars = getEnvConfig(['gclient_custom_vars'], {}) @@ -934,10 +933,6 @@ Config.prototype.updateInternal = function (options) { this.__outputDir = options.C } - if (options.gclient_file && options.gclient_file !== 'default') { - this.gclientFile = options.gclient_file - } - if (options.channel) { this.channel = options.channel } else if (this.buildConfig === 'Release') { diff --git a/build/commands/lib/syncUtils.js b/build/commands/lib/syncUtils.js index 941e9bd2951..be173c5ecf1 100644 --- a/build/commands/lib/syncUtils.js +++ b/build/commands/lib/syncUtils.js @@ -31,7 +31,7 @@ function toGClientConfigItem(name, value, pretty = true) { return `${name} = ${pythonLikeValue}\n` } -function writeRootGclientFile( +function writeGclientConfig( targetOSList, targetArchList, onlyChromium = false, @@ -87,7 +87,7 @@ function writeRootGclientFile( } } - util.writeFileIfModified(config.rootGclientFile, out) + util.writeFileIfModified(config.gclientFile, out) } function shouldUpdateChromium(latestSyncInfo, expectedSyncInfo) { @@ -161,7 +161,7 @@ function syncChromium(program) { const latestSyncInfo = util.readJSON(latestSyncInfoFilePath, {}) const expectedSyncInfo = { chromiumRef: requiredChromiumRef, - gclientTimestamp: fs.statSync(config.rootGclientFile).mtimeMs.toString(), + gclientTimestamp: fs.statSync(config.gclientFile).mtimeMs.toString(), } const chromiumNeedsUpdate = shouldUpdateChromium( @@ -251,7 +251,7 @@ async function checkInternalDepsEndpoint() { } module.exports = { - writeRootGclientFile, + writeGclientConfig, syncChromium, checkInternalDepsEndpoint, } diff --git a/build/commands/scripts/sync.js b/build/commands/scripts/sync.js index 0fbe0b086ed..31b335c9951 100644 --- a/build/commands/scripts/sync.js +++ b/build/commands/scripts/sync.js @@ -17,7 +17,6 @@ const syncUtil = require('../lib/syncUtils') program .version(process.env.npm_package_version) - .option('--gclient_file ', 'gclient config file location') .option('--gclient_verbose', 'verbose output for gclient') .option('--target_os ', 'comma-separated target OS list') .option( @@ -88,10 +87,10 @@ async function RunCommand() { program.init || program.target_os || program.target_arch - || !fs.existsSync(config.rootGclientFile) + || !fs.existsSync(config.gclientFile) || config.isCI ) { - syncUtil.writeRootGclientFile(targetOSList, targetArchList) + syncUtil.writeGclientConfig(targetOSList, targetArchList) } if (config.isCI) {