Skip to content

Commit

Permalink
Merge pull request #16001 from brave/maxk-fix-asan-build
Browse files Browse the repository at this point in the history
[Cr108 Follow up] Fixes ASAN build.
  • Loading branch information
mkarolin committed Nov 18, 2022
1 parent c686239 commit 59e5ced
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build/commands/lib/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ const Config = function () {
}
}

Config.prototype.isOfficialBuild = function () {
Config.prototype.isReleaseBuild = function () {
return this.buildConfig === 'Release'
}

Expand Down Expand Up @@ -267,7 +267,7 @@ Config.prototype.buildArgs = function () {
enable_nacl: false,
enable_widevine: true,
target_cpu: this.targetArch,
is_official_build: this.isOfficialBuild() && !this.isAsan(),
is_official_build: this.isReleaseBuild() && !this.isAsan(),
is_debug: this.isDebug(),
dcheck_always_on: getNPMConfig(['dcheck_always_on']) || this.isComponentBuild(),
brave_channel: this.channel,
Expand Down Expand Up @@ -324,7 +324,7 @@ Config.prototype.buildArgs = function () {
...this.extraGnArgs,
}

if (!this.isOfficialBuild()) {
if (!args.is_official_build) {
args.branding_path_product += "-development"
}

Expand Down Expand Up @@ -454,7 +454,7 @@ Config.prototype.buildArgs = function () {
if (this.targetOS === 'android') {
args.android_channel = this.channel
args.enable_jdk_library_desugaring = false
if (!this.isOfficialBuild()) {
if (!this.isReleaseBuild()) {
args.android_channel = 'default'
args.chrome_public_manifest_package = 'com.brave.browser_default'
} else if (this.channel === '') {
Expand Down

0 comments on commit 59e5ced

Please sign in to comment.