Merge pull request #639 from brave/cleanup_fetching_chromium_version

pass chrome version to gn
brave · Jul 25, 2018 · 8402019 · 8402019
2 parents c5f2314 + 8094969
commit 8402019
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/build/lib/config.js b/build/lib/config.js
@@ -37,7 +37,8 @@ const Config = function () {
   this.safeBrowsingApiEndpoint = getNPMConfig(['safe_browsing_api_endpoint']) || 'safebrowsing.brave.com'
   this.buildProjects()
   const braveCoreDirPackage = path.join(this.projects['brave-core'].dir, 'package')
-  this.braveCoreVersion = getNPMConfig(['brave_version']) || (fs.existsSync(braveCoreDirPackage + '.json') && require(braveCoreDirPackage)['version']) || ''
+  this.braveCoreVersion = (fs.existsSync(braveCoreDirPackage + '.json') && require(braveCoreDirPackage)['version']) || '0.0.0'
+  this.chromeVersion = getNPMConfig(['projects', 'chrome', 'tag']) || '0.0.0.0'
   this.releaseTag = this.braveCoreVersion.split('+')[0]
   this.mac_signing_identifier = getNPMConfig(['mac_signing_identifier']) || ''
   this.mac_signing_keychain = getNPMConfig(['mac_signing_keychain']) || 'login'
@@ -75,6 +76,7 @@ Config.prototype.buildArgs = function () {
     brave_version_major: version_parts[0],
     brave_version_minor: version_parts[1],
     brave_version_build: version_parts[2],
+    chrome_version_string: this.chromeVersion,
     safebrowsing_api_endpoint: this.safeBrowsingApiEndpoint,
   }