Issue #303 Part 1: Move basilisk files from /browser to /application/basilisk

65 files changed, 0 insertions, 1169 deletions

diff --git a/browser/config/mozconfigs/common b/browser/config/mozconfigs/common
deleted file mode 100644
index febf5622f..000000000
--- a/browser/config/mozconfigs/common
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# This file is included by all browser mozconfigs
-
-. "$topsrcdir/build/mozconfig.common"
diff --git a/browser/config/mozconfigs/linux32/artifact b/browser/config/mozconfigs/linux32/artifact
deleted file mode 100644
index 29eb8ba1c..000000000
--- a/browser/config/mozconfigs/linux32/artifact
+++ /dev/null
@@ -1,10 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
-. "$topsrcdir/build/mozconfig.common.override"
-
-ac_add_options --enable-artifact-builds
-ac_add_options --enable-artifact-build-symbols
-unset CC
-unset CXX
diff --git a/browser/config/mozconfigs/linux32/beta b/browser/config/mozconfigs/linux32/beta
deleted file mode 100644
index 315c32b84..000000000
--- a/browser/config/mozconfigs/linux32/beta
+++ /dev/null
@@ -1,15 +0,0 @@
-MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-mk_add_options MOZ_PGO=1
-
-. "$topsrcdir/build/mozconfig.rust"
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux32/common-opt b/browser/config/mozconfigs/linux32/common-opt
deleted file mode 100644
index 3bf3e530e..000000000
--- a/browser/config/mozconfigs/linux32/common-opt
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is sourced by nightly, beta, and release mozconfigs.
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-google-api-keyfile=/builds/gapi.data
-ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
-
-. $topsrcdir/build/unix/mozconfig.linux32
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/mozconfigs/linux32/debug b/browser/config/mozconfigs/linux32/debug
deleted file mode 100644
index de97087d2..000000000
--- a/browser/config/mozconfigs/linux32/debug
+++ /dev/null
@@ -1,24 +0,0 @@
-ac_add_options --enable-debug
-ac_add_options --enable-dmd
-ac_add_options --enable-verify-mar
-
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. $topsrcdir/build/unix/mozconfig.linux32
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-#Use ccache
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.rust"
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/linux32/debug-artifact b/browser/config/mozconfigs/linux32/debug-artifact
deleted file mode 100644
index 3fc3faf89..000000000
--- a/browser/config/mozconfigs/linux32/debug-artifact
+++ /dev/null
@@ -1,12 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/build/unix/mozconfig.linux32"
-. "$topsrcdir/build/mozconfig.common.override"
-
-ac_add_options --enable-artifact-builds
-ac_add_options --enable-artifact-build-symbols
-unset CC
-unset CXX
-
-ac_add_options --enable-debug
diff --git a/browser/config/mozconfigs/linux32/debug-asan b/browser/config/mozconfigs/linux32/debug-asan
deleted file mode 100644
index 9fc7b9bff..000000000
--- a/browser/config/mozconfigs/linux32/debug-asan
+++ /dev/null
@@ -1,23 +0,0 @@
-# Use at least -O1 for optimization to avoid stack space
-# exhaustions caused by Clang function inlining.
-ac_add_options --enable-debug
-ac_add_options --enable-optimize="-O1"
-
-# ASan specific options on Linux
-ac_add_options --enable-valgrind
-
-. $topsrcdir/build/unix/mozconfig.asan
-
-export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
-. $topsrcdir/build/unix/mozconfig.gtk
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=asan
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux32/l10n-mozconfig b/browser/config/mozconfigs/linux32/l10n-mozconfig
deleted file mode 100644
index ae7cc933b..000000000
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-no_sccache=1
-
-ac_add_options --with-l10n-base=../../l10n
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-official-branding
-
-. $topsrcdir/build/unix/mozconfig.linux32
-
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-ac_add_options --disable-stdcxx-compat
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux32/nightly b/browser/config/mozconfigs/linux32/nightly
deleted file mode 100644
index 6d605ca7d..000000000
--- a/browser/config/mozconfigs/linux32/nightly
+++ /dev/null
@@ -1,15 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
-
-
-ac_add_options --enable-verify-mar
-
-# This will overwrite the default of stripping everything and keep the symbol table.
-# This is useful for profiling and debugging and only increases the package size
-# by 2 MBs.
-STRIP_FLAGS="--strip-debug"
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.rust"
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/linux32/nightly-asan b/browser/config/mozconfigs/linux32/nightly-asan
deleted file mode 100644
index 0930c184f..000000000
--- a/browser/config/mozconfigs/linux32/nightly-asan
+++ /dev/null
@@ -1,22 +0,0 @@
-# We still need to build with debug symbols
-ac_add_options --disable-debug
-ac_add_options --enable-optimize="-O2 -g"
-
-# ASan specific options on Linux
-ac_add_options --enable-valgrind
-
-. $topsrcdir/build/unix/mozconfig.asan
-
-export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
-. $topsrcdir/build/unix/mozconfig.gtk
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=asan
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux32/release b/browser/config/mozconfigs/linux32/release
deleted file mode 100644
index b17186666..000000000
--- a/browser/config/mozconfigs/linux32/release
+++ /dev/null
@@ -1,22 +0,0 @@
-# This make file should be identical to the beta mozconfig, apart from the
-# safeguard below
-MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-mk_add_options MOZ_PGO=1
-
-# safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
-# defines.sh during the beta cycle
-export BUILDING_RELEASE=1
-
-. "$topsrcdir/build/mozconfig.rust"
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux32/valgrind b/browser/config/mozconfigs/linux32/valgrind
deleted file mode 100644
index c8fb4f574..000000000
--- a/browser/config/mozconfigs/linux32/valgrind
+++ /dev/null
@@ -1,9 +0,0 @@
-. $topsrcdir/browser/config/mozconfigs/linux32/nightly
-
-ac_add_options --enable-valgrind
-ac_add_options --disable-jemalloc
-ac_add_options --disable-install-strip
-
-# Include the override mozconfig again (even though the above includes it)
-# since it's supposed to override everything.
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux64/add-on-devel b/browser/config/mozconfigs/linux64/add-on-devel
deleted file mode 100644
index 0a3dfeb3f..000000000
--- a/browser/config/mozconfigs/linux64/add-on-devel
+++ /dev/null
@@ -1,9 +0,0 @@
-. $topsrcdir/browser/config/mozconfigs/linux64/nightly
-
-#add-on signing is checked but not enforced
-MOZ_REQUIRE_SIGNING=0
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --enable-update-channel=default
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=add-on-devel
diff --git a/browser/config/mozconfigs/linux64/artifact b/browser/config/mozconfigs/linux64/artifact
deleted file mode 100644
index 524a25e69..000000000
--- a/browser/config/mozconfigs/linux64/artifact
+++ /dev/null
@@ -1,10 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
-. "$topsrcdir/build/mozconfig.common.override"
-
-ac_add_options --enable-artifact-builds
-ac_add_options --enable-artifact-build-symbols
-unset CC
-unset CXX
diff --git a/browser/config/mozconfigs/linux64/beta b/browser/config/mozconfigs/linux64/beta
deleted file mode 100644
index f349ee9f8..000000000
--- a/browser/config/mozconfigs/linux64/beta
+++ /dev/null
@@ -1,15 +0,0 @@
-MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-mk_add_options MOZ_PGO=1
-
-. "$topsrcdir/build/mozconfig.rust"
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux64/code-coverage b/browser/config/mozconfigs/linux64/code-coverage
deleted file mode 100644
index 48ffa9b17..000000000
--- a/browser/config/mozconfigs/linux64/code-coverage
+++ /dev/null
@@ -1,13 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
-
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-
-ac_add_options --disable-install-strip
-ac_add_options --disable-jemalloc
-ac_add_options --disable-crashreporter
-ac_add_options --disable-elf-hack
-
-MOZ_CODE_COVERAGE=1
-export CFLAGS="-fprofile-arcs -ftest-coverage"
-export CXXFLAGS="-fprofile-arcs -ftest-coverage"
-export LDFLAGS="-fprofile-arcs -ftest-coverage -lgcov -L$TOOLTOOL_DIR/gtk3/usr/local/lib"
diff --git a/browser/config/mozconfigs/linux64/common-opt b/browser/config/mozconfigs/linux64/common-opt
deleted file mode 100644
index 0d605ff9e..000000000
--- a/browser/config/mozconfigs/linux64/common-opt
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is sourced by the nightly, beta, and release mozconfigs.
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-google-api-keyfile=/builds/gapi.data
-ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
-
-. $topsrcdir/build/unix/mozconfig.linux
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/mozconfigs/linux64/debug b/browser/config/mozconfigs/linux64/debug
deleted file mode 100644
index a879da75e..000000000
--- a/browser/config/mozconfigs/linux64/debug
+++ /dev/null
@@ -1,22 +0,0 @@
-ac_add_options --enable-debug
-ac_add_options --enable-dmd
-ac_add_options --enable-verify-mar
-
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. $topsrcdir/build/unix/mozconfig.linux
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.rust"
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/linux64/debug-artifact b/browser/config/mozconfigs/linux64/debug-artifact
deleted file mode 100644
index 6dc4d13ce..000000000
--- a/browser/config/mozconfigs/linux64/debug-artifact
+++ /dev/null
@@ -1,13 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/build/unix/mozconfig.linux"
-. "$topsrcdir/build/mozconfig.common.override"
-
-ac_add_options --enable-artifact-builds
-ac_add_options --enable-artifact-build-symbols
-unset CC
-unset CXX
-
-ac_add_options --enable-debug
-
diff --git a/browser/config/mozconfigs/linux64/debug-asan b/browser/config/mozconfigs/linux64/debug-asan
deleted file mode 100644
index a772dbb51..000000000
--- a/browser/config/mozconfigs/linux64/debug-asan
+++ /dev/null
@@ -1,23 +0,0 @@
-# Use at least -O1 for optimization to avoid stack space
-# exhaustions caused by Clang function inlining.
-ac_add_options --enable-debug
-ac_add_options --enable-optimize="-O1"
-
-# ASan specific options on Linux
-ac_add_options --enable-valgrind
-
-. $topsrcdir/build/unix/mozconfig.asan
-
-export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
-. $topsrcdir/build/unix/mozconfig.gtk
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=asan
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux64/debug-static-analysis-clang b/browser/config/mozconfigs/linux64/debug-static-analysis-clang
deleted file mode 100644
index ff41e13f9..000000000
--- a/browser/config/mozconfigs/linux64/debug-static-analysis-clang
+++ /dev/null
@@ -1,23 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_PACKAGE_TESTS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/build/mozconfig.common"
-
-ac_add_options --enable-debug
-ac_add_options --enable-dmd
-
-# Use Clang as specified in manifest
-export CC="$topsrcdir/clang/bin/clang"
-export CXX="$topsrcdir/clang/bin/clang++"
-
-# Add the static checker
-ac_add_options --enable-clang-plugin
-
-. "$topsrcdir/build/unix/mozconfig.stdcxx"
-
-export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
-. $topsrcdir/build/unix/mozconfig.gtk
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/linux64/hazards b/browser/config/mozconfigs/linux64/hazards
deleted file mode 100644
index 03d72ef7e..000000000
--- a/browser/config/mozconfigs/linux64/hazards
+++ /dev/null
@@ -1,35 +0,0 @@
-# This mozconfig is used when compiling the browser for the rooting hazard
-# analysis build (labeled H on treeherder). See
-# https://wiki.mozilla.org/Javascript:SpiderMonkey:ExactStackRooting
-
-# Do NOT include build/unix/mozconfig.linux because it points directly at the
-# tooltool-installed gcc, and the analysis works by wrapping the gcc invocation
-# with a script that invokes the real gcc with -fplugin and its configuration
-# directives. Instead, duplicate the contents of that mozconfig here:
-
-. "$topsrcdir/build/mozconfig.common"
-ac_add_options --enable-elf-hack
-
-. "$topsrcdir/build/unix/mozconfig.stdcxx"
-
-# The objdir must be at a known location so its path can be stripped from the
-# filenames stored by the analysis
-mk_add_options MOZ_OBJDIR=obj-analyzed
-
-# The configuration options are chosen to compile the most code
-# (--enable-debug, --enable-tests) in the trickiest way possible
-# (--enable-optimize) to maximize the chance of seeing tricky static orderings.
-ac_add_options --enable-debug
-ac_add_options --enable-tests
-ac_add_options --enable-optimize
-ac_add_options --with-compiler-wrapper=$TOOLTOOL_DIR/sixgill/usr/libexec/sixgill/scripts/wrap_gcc/basecc
-ac_add_options --without-ccache
-
-CFLAGS="$CFLAGS -Wno-attributes"
-CPPFLAGS="$CPPFLAGS -Wno-attributes"
-CXXFLAGS="$CXXFLAGS -Wno-attributes"
-
-export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
-. $topsrcdir/build/unix/mozconfig.gtk
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux64/l10n-mozconfig b/browser/config/mozconfigs/linux64/l10n-mozconfig
deleted file mode 100644
index 4df482dc3..000000000
--- a/browser/config/mozconfigs/linux64/l10n-mozconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-no_sccache=1
-
-ac_add_options --with-l10n-base=../../l10n
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-official-branding
-
-. $topsrcdir/build/unix/mozconfig.linux
-
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-ac_add_options --disable-stdcxx-compat
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux64/nightly b/browser/config/mozconfigs/linux64/nightly
deleted file mode 100644
index ec360a99a..000000000
--- a/browser/config/mozconfigs/linux64/nightly
+++ /dev/null
@@ -1,15 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
-
-
-ac_add_options --enable-verify-mar
-
-# This will overwrite the default of stripping everything and keep the symbol table.
-# This is useful for profiling and debugging and only increases the package size
-# by 2 MBs.
-STRIP_FLAGS="--strip-debug"
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.rust"
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/linux64/nightly-asan b/browser/config/mozconfigs/linux64/nightly-asan
deleted file mode 100644
index 833b530d2..000000000
--- a/browser/config/mozconfigs/linux64/nightly-asan
+++ /dev/null
@@ -1,19 +0,0 @@
-# We still need to build with debug symbols
-ac_add_options --disable-debug
-ac_add_options --enable-optimize="-O2 -gline-tables-only"
-
-# ASan specific options on Linux
-ac_add_options --enable-valgrind
-
-. $topsrcdir/build/unix/mozconfig.asan
-
-export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
-. $topsrcdir/build/unix/mozconfig.gtk
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=asan
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux64/opt-static-analysis-clang b/browser/config/mozconfigs/linux64/opt-static-analysis-clang
deleted file mode 100644
index 936cc46f7..000000000
--- a/browser/config/mozconfigs/linux64/opt-static-analysis-clang
+++ /dev/null
@@ -1,22 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_PACKAGE_TESTS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/build/mozconfig.common"
-
-ac_add_options --enable-dmd
-
-# Use Clang as specified in manifest
-CC="$topsrcdir/clang/bin/clang"
-CXX="$topsrcdir/clang/bin/clang++"
-
-# Add the static checker
-ac_add_options --enable-clang-plugin
-
-. "$topsrcdir/build/unix/mozconfig.stdcxx"
-
-export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
-. $topsrcdir/build/unix/mozconfig.gtk
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/linux64/opt-tsan b/browser/config/mozconfigs/linux64/opt-tsan
deleted file mode 100644
index 12b156633..000000000
--- a/browser/config/mozconfigs/linux64/opt-tsan
+++ /dev/null
@@ -1,9 +0,0 @@
-. $topsrcdir/build/unix/mozconfig.tsan
-
-export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
-. $topsrcdir/build/unix/mozconfig.gtk
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=tsan
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux64/release b/browser/config/mozconfigs/linux64/release
deleted file mode 100644
index 2090f3525..000000000
--- a/browser/config/mozconfigs/linux64/release
+++ /dev/null
@@ -1,22 +0,0 @@
-# This make file should be identical to the beta mozconfig, apart from the
-# safeguard below
-MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-mk_add_options MOZ_PGO=1
-
-# safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
-# defines.sh during the beta cycle
-export BUILDING_RELEASE=1
-
-. "$topsrcdir/build/mozconfig.rust"
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux64/source b/browser/config/mozconfigs/linux64/source
deleted file mode 100644
index 4a3c6996b..000000000
--- a/browser/config/mozconfigs/linux64/source
+++ /dev/null
@@ -1,4 +0,0 @@
-# The source "build" only needs a mozconfig because we use the build system as
-# our script for generating it. This allows us to run configure without any
-# extra dependencies on specific toolchains, e.g. gtk3.
-ac_add_options --disable-compile-environment
diff --git a/browser/config/mozconfigs/linux64/valgrind b/browser/config/mozconfigs/linux64/valgrind
deleted file mode 100644
index 2efc6e3bb..000000000
--- a/browser/config/mozconfigs/linux64/valgrind
+++ /dev/null
@@ -1,9 +0,0 @@
-. $topsrcdir/browser/config/mozconfigs/linux64/nightly
-
-ac_add_options --enable-valgrind
-ac_add_options --disable-jemalloc
-ac_add_options --disable-install-strip
-
-# Include the override mozconfig again (even though the above includes it)
-# since it's supposed to override everything.
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/macosx-universal/beta b/browser/config/mozconfigs/macosx-universal/beta
deleted file mode 100644
index 937185e94..000000000
--- a/browser/config/mozconfigs/macosx-universal/beta
+++ /dev/null
@@ -1,15 +0,0 @@
-MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-. "$topsrcdir/build/mozconfig.rust"
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx-universal/common-opt b/browser/config/mozconfigs/macosx-universal/common-opt
deleted file mode 100644
index 145d32fc9..000000000
--- a/browser/config/mozconfigs/macosx-universal/common-opt
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is sourced by the nightly, beta, and release mozconfigs.
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-# Universal builds override the default of browser (bug 575283 comment 29)
-ac_add_options --enable-application=browser
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-google-api-keyfile=/builds/gapi.data
-ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/mozconfigs/macosx-universal/l10n-mozconfig b/browser/config/mozconfigs/macosx-universal/l10n-mozconfig
deleted file mode 100644
index 80a06ed65..000000000
--- a/browser/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/macosx/mozconfig.common"
-
-ac_add_options --with-l10n-base=../../l10n
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-official-branding
-
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx-universal/nightly b/browser/config/mozconfigs/macosx-universal/nightly
deleted file mode 100644
index 7af737e56..000000000
--- a/browser/config/mozconfigs/macosx-universal/nightly
+++ /dev/null
@@ -1,21 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
-
-ac_add_options --disable-install-strip
-ac_add_options --enable-verify-mar
-
-ac_add_options --enable-instruments
-
-# Cross-universal builds fail when dtrace is enabled
-if test `uname -s` != Linux; then
-  ac_add_options --enable-dtrace
-fi
-
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.rust"
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx-universal/release b/browser/config/mozconfigs/macosx-universal/release
deleted file mode 100644
index 4700886aa..000000000
--- a/browser/config/mozconfigs/macosx-universal/release
+++ /dev/null
@@ -1,21 +0,0 @@
-# This make file should be identical to the beta mozconfig, apart from the
-# safeguard below
-MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-# safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
-# defines.sh during the beta cycle
-export BUILDING_RELEASE=1
-
-. "$topsrcdir/build/mozconfig.rust"
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx64/add-on-devel b/browser/config/mozconfigs/macosx64/add-on-devel
deleted file mode 100644
index e76df4dfa..000000000
--- a/browser/config/mozconfigs/macosx64/add-on-devel
+++ /dev/null
@@ -1,9 +0,0 @@
-. $topsrcdir/browser/config/mozconfigs/macosx64/nightly
-
-#add-on signing is checked but not enforced
-MOZ_REQUIRE_SIGNING=0
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --enable-update-channel=default
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=add-on-devel
diff --git a/browser/config/mozconfigs/macosx64/artifact b/browser/config/mozconfigs/macosx64/artifact
deleted file mode 100644
index c25b21122..000000000
--- a/browser/config/mozconfigs/macosx64/artifact
+++ /dev/null
@@ -1,10 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/build/macosx/mozconfig.common"
-. "$topsrcdir/build/mozconfig.common.override"
-
-ac_add_options --enable-artifact-builds
-ac_add_options --enable-artifact-build-symbols
-unset CC
-unset CXX
diff --git a/browser/config/mozconfigs/macosx64/debug b/browser/config/mozconfigs/macosx64/debug
deleted file mode 100644
index 4b052aa00..000000000
--- a/browser/config/mozconfigs/macosx64/debug
+++ /dev/null
@@ -1,24 +0,0 @@
-. $topsrcdir/build/macosx/mozconfig.common
-
-ac_add_options --enable-debug
-ac_add_options --enable-dmd
-ac_add_options --enable-verify-mar
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.rust"
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx64/debug-artifact b/browser/config/mozconfigs/macosx64/debug-artifact
deleted file mode 100644
index 3afa8e4bf..000000000
--- a/browser/config/mozconfigs/macosx64/debug-artifact
+++ /dev/null
@@ -1,12 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/build/macosx/mozconfig.common"
-. "$topsrcdir/build/mozconfig.common.override"
-
-ac_add_options --enable-artifact-builds
-ac_add_options --enable-artifact-build-symbols
-unset CC
-unset CXX
-
-ac_add_options --enable-debug
diff --git a/browser/config/mozconfigs/macosx64/debug-asan b/browser/config/mozconfigs/macosx64/debug-asan
deleted file mode 100644
index 28d23798b..000000000
--- a/browser/config/mozconfigs/macosx64/debug-asan
+++ /dev/null
@@ -1,20 +0,0 @@
-. $topsrcdir/build/unix/mozconfig.asan
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-debug
-ac_add_options --enable-optimize="-O1"
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=asan
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/macosx64/debug-static-analysis b/browser/config/mozconfigs/macosx64/debug-static-analysis
deleted file mode 100644
index bb19af612..000000000
--- a/browser/config/mozconfigs/macosx64/debug-static-analysis
+++ /dev/null
@@ -1,13 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_PACKAGE_TESTS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. $topsrcdir/build/macosx/mozconfig.common
-
-ac_add_options --enable-debug
-ac_add_options --enable-dmd
-
-ac_add_options --enable-clang-plugin
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx64/l10n-mozconfig b/browser/config/mozconfigs/macosx64/l10n-mozconfig
deleted file mode 100644
index 40ad84086..000000000
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --with-l10n-base=../../l10n
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-official-branding
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx64/nightly b/browser/config/mozconfigs/macosx64/nightly
deleted file mode 100644
index 12fec0474..000000000
--- a/browser/config/mozconfigs/macosx64/nightly
+++ /dev/null
@@ -1,22 +0,0 @@
-. $topsrcdir/build/macosx/mozconfig.common
-
-ac_add_options --enable-verify-mar
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.rust"
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx64/opt-static-analysis b/browser/config/mozconfigs/macosx64/opt-static-analysis
deleted file mode 100644
index 72ed3d6bd..000000000
--- a/browser/config/mozconfigs/macosx64/opt-static-analysis
+++ /dev/null
@@ -1,16 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_PACKAGE_TESTS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. $topsrcdir/build/macosx/mozconfig.common
-
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-dmd
-
-ac_add_options --enable-clang-plugin
-
-. "$topsrcdir/build/mozconfig.rust"
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
-
diff --git a/browser/config/mozconfigs/whitelist b/browser/config/mozconfigs/whitelist
deleted file mode 100644
index 65b66b6f2..000000000
--- a/browser/config/mozconfigs/whitelist
+++ /dev/null
@@ -1,100 +0,0 @@
-# 'nightly' contains things that are in nightly mozconfigs and allowed to be missing from release builds.
-# Other keys in whitelist contain things are in that branches mozconfigs and allowed to be missing from nightly builds.
-whitelist = {
-    'release': {},
-    'nightly': {},
-    }
-
-all_platforms = ['win64', 'win32', 'linux32', 'linux64', 'macosx-universal']
-
-for platform in all_platforms:
-    whitelist['nightly'][platform] = [
-        'ac_add_options --enable-update-channel=nightly',
-        'ac_add_options --with-branding=browser/branding/nightly',
-        'ac_add_options --enable-profiling',
-        'mk_add_options CLIENT_PY_ARGS="--hg-options=\'--verbose --time\' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --tinderbox-print"'
-    ]
-
-for platform in ['linux32', 'linux64', 'macosx-universal']:
-    whitelist['nightly'][platform] += [
-        'mk_add_options MOZ_MAKE_FLAGS="-j4"',
-    ]
-
-whitelist['nightly']['linux32'] += [
-    'CXX=$REAL_CXX',
-    'CXX="ccache $REAL_CXX"',
-    'CC="ccache $REAL_CC"',
-    'mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl',
-    'ac_add_options --with-ccache=/usr/bin/ccache',
-    '. "$topsrcdir/build/mozconfig.cache"',
-    'export MOZILLA_OFFICIAL=1',
-    'export MOZ_TELEMETRY_REPORTING=1',
-    "mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'",
-    'STRIP_FLAGS="--strip-debug"',
-]
-
-whitelist['nightly']['linux64'] += [
-    'export MOZILLA_OFFICIAL=1',
-    'export MOZ_TELEMETRY_REPORTING=1',
-    "mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'",
-    'STRIP_FLAGS="--strip-debug"',
-    'ac_add_options --with-ccache=/usr/bin/ccache',
-    '. "$topsrcdir/build/mozconfig.cache"',
-]
-
-whitelist['nightly']['macosx-universal'] += [
-    'if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then',
-    'ac_add_options --with-macbundlename-prefix=Firefox',
-    'fi',
-    'mk_add_options MOZ_MAKE_FLAGS="-j12"',
-    'ac_add_options --with-ccache',
-    '. "$topsrcdir/build/mozconfig.cache"',
-    'ac_add_options --disable-install-strip',
-    'ac_add_options --enable-instruments',
-    'ac_add_options --enable-dtrace',
-]
-
-whitelist['nightly']['win32'] += [
-    '. $topsrcdir/configs/mozilla2/win32/include/choose-make-flags',
-    'mk_add_options MOZ_MAKE_FLAGS=-j1',
-    '. "$topsrcdir/build/mozconfig.cache"',
-    'if test "$IS_NIGHTLY" != ""; then',
-    'ac_add_options --disable-auto-deps',
-    'fi',
-]
-whitelist['nightly']['win64'] += [
-    '. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"',
-    '. "$topsrcdir/build/mozconfig.cache"',
-]
-
-for platform in all_platforms:
-    whitelist['release'][platform] = [
-        'ac_add_options --enable-update-channel=release',
-        'ac_add_options --enable-official-branding',
-        'mk_add_options MOZ_MAKE_FLAGS="-j4"',
-        'export BUILDING_RELEASE=1',
-        'if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then',
-        'MOZ_AUTOMATION_UPLOAD_SYMBOLS=1',
-        'MOZ_AUTOMATION_UPDATE_PACKAGING=1',
-        'fi',
-        'MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}',
-    ]
-whitelist['release']['win32'] += ['mk_add_options MOZ_PGO=1']
-whitelist['release']['win64'] += ['mk_add_options MOZ_PGO=1']
-
-whitelist['release']['linux32'] += [
-    'export MOZILLA_OFFICIAL=1',
-    'export MOZ_TELEMETRY_REPORTING=1',
-    'mk_add_options MOZ_PGO=1',
-    "mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'",
-]
-whitelist['release']['linux64'] += [
-    'export MOZILLA_OFFICIAL=1',
-    'export MOZ_TELEMETRY_REPORTING=1',
-    'mk_add_options MOZ_PGO=1',
-    "mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'",
-]
-
-if __name__ == '__main__':
-    import pprint
-    pprint.pprint(whitelist)
diff --git a/browser/config/mozconfigs/win32/add-on-devel b/browser/config/mozconfigs/win32/add-on-devel
deleted file mode 100644
index d84c1f5e4..000000000
--- a/browser/config/mozconfigs/win32/add-on-devel
+++ /dev/null
@@ -1,9 +0,0 @@
-. $topsrcdir/browser/config/mozconfigs/win32/nightly
-
-#add-on signing is checked but not enforced
-MOZ_REQUIRE_SIGNING=0
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --enable-update-channel=default
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=add-on-devel
diff --git a/browser/config/mozconfigs/win32/artifact b/browser/config/mozconfigs/win32/artifact
deleted file mode 100644
index 888c99668..000000000
--- a/browser/config/mozconfigs/win32/artifact
+++ /dev/null
@@ -1,10 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/win32/mozconfig.vs-latest"
-. "$topsrcdir/build/mozconfig.common.override"
-
-ac_add_options --enable-artifact-builds
-ac_add_options --enable-artifact-build-symbols
diff --git a/browser/config/mozconfigs/win32/beta b/browser/config/mozconfigs/win32/beta
deleted file mode 100644
index cc14d6800..000000000
--- a/browser/config/mozconfigs/win32/beta
+++ /dev/null
@@ -1,18 +0,0 @@
-MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
-
-mk_add_options MOZ_PGO=1
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-. "$topsrcdir/build/mozconfig.rust"
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/win32/common-opt b/browser/config/mozconfigs/win32/common-opt
deleted file mode 100644
index 816c8926a..000000000
--- a/browser/config/mozconfigs/win32/common-opt
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file is sourced by the nightly, beta, and release mozconfigs.
-
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-jemalloc
-
-if [ -f /c/builds/gapi.data ]; then
-  _gapi_keyfile=c:/builds/gapi.data
-else
-  _gapi_keyfile=e:/builds/gapi.data
-fi
-ac_add_options --with-google-api-keyfile=${_gapi_keyfile}
-
-ac_add_options --with-mozilla-api-keyfile=c:/builds/mozilla-desktop-geoloc-api.key
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/mozconfigs/win32/debug b/browser/config/mozconfigs/win32/debug
deleted file mode 100644
index 815276d0f..000000000
--- a/browser/config/mozconfigs/win32/debug
+++ /dev/null
@@ -1,26 +0,0 @@
-. "$topsrcdir/build/mozconfig.win-common"
-MOZ_AUTOMATION_L10N_CHECK=0
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --enable-debug
-ac_add_options --enable-dmd
-ac_add_options --enable-profiling  # needed for --enable-dmd to work on Windows
-ac_add_options --enable-verify-mar
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.rust"
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/win32/debug-artifact b/browser/config/mozconfigs/win32/debug-artifact
deleted file mode 100644
index 5a31b8b3e..000000000
--- a/browser/config/mozconfigs/win32/debug-artifact
+++ /dev/null
@@ -1,12 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/win32/mozconfig.vs-latest"
-. "$topsrcdir/build/mozconfig.common.override"
-
-ac_add_options --enable-artifact-builds
-ac_add_options --enable-artifact-build-symbols
-
-ac_add_options --enable-debug
diff --git a/browser/config/mozconfigs/win32/debug-static-analysis b/browser/config/mozconfigs/win32/debug-static-analysis
deleted file mode 100644
index efc0820b5..000000000
--- a/browser/config/mozconfigs/win32/debug-static-analysis
+++ /dev/null
@@ -1,19 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_PACKAGE_TESTS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --enable-debug
-ac_add_options --enable-dmd
-
-ac_add_options --enable-clang-plugin
-
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
-. "$topsrcdir/build/mozconfig.rust"
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
-. "$topsrcdir/build/mozconfig.clang-cl"
diff --git a/browser/config/mozconfigs/win32/l10n-mozconfig b/browser/config/mozconfigs/win32/l10n-mozconfig
deleted file mode 100644
index d05067e03..000000000
--- a/browser/config/mozconfigs/win32/l10n-mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-l10n-base=../../l10n
-ac_add_options --with-windows-version=603
-ac_add_options --enable-official-branding
-
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/win32/nightly b/browser/config/mozconfigs/win32/nightly
deleted file mode 100644
index 210004905..000000000
--- a/browser/config/mozconfigs/win32/nightly
+++ /dev/null
@@ -1,12 +0,0 @@
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
-
-
-ac_add_options --enable-verify-mar
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.rust"
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/win32/release b/browser/config/mozconfigs/win32/release
deleted file mode 100644
index daaa45f89..000000000
--- a/browser/config/mozconfigs/win32/release
+++ /dev/null
@@ -1,24 +0,0 @@
-# This make file should be identical to the beta mozconfig, apart from the
-# safeguard below
-MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
-
-mk_add_options MOZ_PGO=1
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-# safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
-# defines.sh during the beta cycle
-export BUILDING_RELEASE=1
-
-. "$topsrcdir/build/mozconfig.rust"
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/win64/add-on-devel b/browser/config/mozconfigs/win64/add-on-devel
deleted file mode 100644
index 47d0bf589..000000000
--- a/browser/config/mozconfigs/win64/add-on-devel
+++ /dev/null
@@ -1,9 +0,0 @@
-. $topsrcdir/browser/config/mozconfigs/win64/nightly
-
-#add-on signing is checked but not enforced
-MOZ_REQUIRE_SIGNING=0
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --enable-update-channel=default
-
-#Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=add-on-devel
diff --git a/browser/config/mozconfigs/win64/artifact b/browser/config/mozconfigs/win64/artifact
deleted file mode 100644
index ce6969667..000000000
--- a/browser/config/mozconfigs/win64/artifact
+++ /dev/null
@@ -1,11 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/win64/mozconfig.vs-latest"
-. "$topsrcdir/build/mozconfig.common.override"
-
-ac_add_options --enable-artifact-builds
-ac_add_options --enable-artifact-build-symbols
diff --git a/browser/config/mozconfigs/win64/beta b/browser/config/mozconfigs/win64/beta
deleted file mode 100644
index 6fc4ebe36..000000000
--- a/browser/config/mozconfigs/win64/beta
+++ /dev/null
@@ -1,19 +0,0 @@
-MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
-. "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
-
-mk_add_options MOZ_PGO=1
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-. "$topsrcdir/build/mozconfig.rust"
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/win64/common-opt b/browser/config/mozconfigs/win64/common-opt
deleted file mode 100644
index 40fba7f76..000000000
--- a/browser/config/mozconfigs/win64/common-opt
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file is sourced by the nightly, beta, and release mozconfigs.
-
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-jemalloc
-if [ -f /c/builds/gapi.data ]; then
-  _gapi_keyfile=c:/builds/gapi.data
-else
-  _gapi_keyfile=e:/builds/gapi.data
-fi
-ac_add_options --with-google-api-keyfile=${_gapi_keyfile}
-
-ac_add_options --with-mozilla-api-keyfile=c:/builds/mozilla-desktop-geoloc-api.key
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-. $topsrcdir/build/win64/mozconfig.vs-latest
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/mozconfigs/win64/common-win64 b/browser/config/mozconfigs/win64/common-win64
deleted file mode 100644
index 8f167cad1..000000000
--- a/browser/config/mozconfigs/win64/common-win64
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is used by all Win64 builds
-
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
-
diff --git a/browser/config/mozconfigs/win64/debug b/browser/config/mozconfigs/win64/debug
deleted file mode 100644
index db4eb5940..000000000
--- a/browser/config/mozconfigs/win64/debug
+++ /dev/null
@@ -1,29 +0,0 @@
-. "$topsrcdir/build/mozconfig.win-common"
-MOZ_AUTOMATION_L10N_CHECK=0
-. "$topsrcdir/browser/config/mozconfigs/common"
-
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
-
-ac_add_options --enable-debug
-ac_add_options --enable-dmd
-ac_add_options --enable-profiling  # needed for --enable-dmd to work on Windows
-ac_add_options --enable-verify-mar
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. $topsrcdir/build/win64/mozconfig.vs-latest
-
-. "$topsrcdir/build/mozconfig.rust"
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/win64/debug-artifact b/browser/config/mozconfigs/win64/debug-artifact
deleted file mode 100644
index bbba268fb..000000000
--- a/browser/config/mozconfigs/win64/debug-artifact
+++ /dev/null
@@ -1,13 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/win64/mozconfig.vs-latest"
-. "$topsrcdir/build/mozconfig.common.override"
-
-ac_add_options --enable-artifact-builds
-ac_add_options --enable-artifact-build-symbols
-
-ac_add_options --enable-debug
diff --git a/browser/config/mozconfigs/win64/l10n-mozconfig b/browser/config/mozconfigs/win64/l10n-mozconfig
deleted file mode 100644
index 3b9b4af1c..000000000
--- a/browser/config/mozconfigs/win64/l10n-mozconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-l10n-base=../../l10n
-ac_add_options --with-windows-version=603
-ac_add_options --enable-official-branding
-
-export MOZILLA_OFFICIAL=1
-
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
-. $topsrcdir/build/win64/mozconfig.vs-latest
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/win64/nightly b/browser/config/mozconfigs/win64/nightly
deleted file mode 100644
index aee22f1c0..000000000
--- a/browser/config/mozconfigs/win64/nightly
+++ /dev/null
@@ -1,13 +0,0 @@
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
-. "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
-
-
-ac_add_options --enable-verify-mar
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.rust"
-
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/win64/release b/browser/config/mozconfigs/win64/release
deleted file mode 100644
index 62e83205f..000000000
--- a/browser/config/mozconfigs/win64/release
+++ /dev/null
@@ -1,25 +0,0 @@
-# This make file should be identical to the beta mozconfig, apart from the
-# safeguard below
-MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
-. "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
-
-mk_add_options MOZ_PGO=1
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-# safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
-# defines.sh during the beta cycle
-export BUILDING_RELEASE=1
-
-. "$topsrcdir/build/mozconfig.rust"
-
-. "$topsrcdir/build/mozconfig.common.override"