From fb02e02524208fa4d1abfbff7254740bc589973a Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 30 Jul 2020 11:30:34 +0000
Subject: [PATCH] Bug 1654994 - Make full symbols archive opt-in rather than
 opt-out. r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D85354
---
 Makefile.in                               | 10 +++++-----
 build/mozconfig.artifact                  |  2 +-
 taskcluster/taskgraph/transforms/build.py |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index e7205bf89d95..bfb6187c6b51 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -211,13 +211,13 @@ symbolsarchive: prepsymbolsarchive
                                      $(abspath $(DIST)/crashreporter-symbols))
 
 ifdef MOZ_CRASHREPORTER
-# Set MOZ_DISABLE_FULL_SYMBOLS to disable generation and upload of the full
+# Set MOZ_ENABLE_FULL_SYMBOLS to enable generation and upload of the full
 # crashreporter symbols archives
-ifdef MOZ_DISABLE_FULL_SYMBOLS
-buildsymbols: symbolsarchive
-else
+ifdef MOZ_ENABLE_FULL_SYMBOLS
 buildsymbols: symbolsfullarchive symbolsarchive
-endif # MOZ_DISABLE_FULL_SYMBOLS
+else
+buildsymbols: symbolsarchive
+endif # MOZ_ENABLE_FULL_SYMBOLS
 else
 buildsymbols:
 endif
diff --git a/build/mozconfig.artifact b/build/mozconfig.artifact
index 25a4eb497ee9..b2b12d0faf50 100644
--- a/build/mozconfig.artifact
+++ b/build/mozconfig.artifact
@@ -2,7 +2,7 @@
 
 # Enable the artifact build.
 ac_add_options --enable-artifact-builds
-if test -n "$MOZ_ARTIFACT_TASK_WIN32_OPT" -a -z "$MOZ_DISABLE_FULL_SYMBOLS"; then
+if test -n "$MOZ_ARTIFACT_TASK_WIN32_OPT" -a -n "$MOZ_ENABLE_FULL_SYMBOLS"; then
   ac_add_options --enable-artifact-build-symbols=full
 else
   ac_add_options --enable-artifact-build-symbols
diff --git a/taskcluster/taskgraph/transforms/build.py b/taskcluster/taskgraph/transforms/build.py
index e2ea49fde299..08b823c3ed4b 100644
--- a/taskcluster/taskgraph/transforms/build.py
+++ b/taskcluster/taskgraph/transforms/build.py
@@ -188,8 +188,8 @@ def enable_full_crashsymbols(config, jobs):
         enable_full_crashsymbols = job['attributes'].get('enable-full-crashsymbols')
         if enable_full_crashsymbols and config.params['project'] in branches:
             logger.debug("Enabling full symbol generation for %s", job['name'])
+            job['worker']['env']['MOZ_ENABLE_FULL_SYMBOLS'] = '1'
         else:
             logger.debug("Disabling full symbol generation for %s", job['name'])
-            job['worker']['env']['MOZ_DISABLE_FULL_SYMBOLS'] = '1'
             job['attributes'].pop('enable-full-crashsymbols', None)
         yield job