From 59e5ced61d4e727152ce4f519ef7165986e3f6fe Mon Sep 17 00:00:00 2001 From: Max <41635752+mkarolin@users.noreply.github.com> Date: Fri, 18 Nov 2022 11:57:56 -0500 Subject: [PATCH] Merge pull request #16001 from brave/maxk-fix-asan-build [Cr108 Follow up] Fixes ASAN build. --- build/commands/lib/config.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/commands/lib/config.js b/build/commands/lib/config.js index e99f393e90b1..eb8d371be08f 100644 --- a/build/commands/lib/config.js +++ b/build/commands/lib/config.js @@ -193,7 +193,7 @@ const Config = function () { } } -Config.prototype.isOfficialBuild = function () { +Config.prototype.isReleaseBuild = function () { return this.buildConfig === 'Release' } @@ -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, @@ -324,7 +324,7 @@ Config.prototype.buildArgs = function () { ...this.extraGnArgs, } - if (!this.isOfficialBuild()) { + if (!args.is_official_build) { args.branding_path_product += "-development" } @@ -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 === '') {