Adding upstream version 115.8.0esr.upstream/115.8.0esr

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

55 files changed, 770 insertions, 0 deletions

diff --git a/mobile/android/config/mozconfigs/android-aarch64/beta b/mobile/android/config/mozconfigs/android-aarch64/beta
new file mode 100644
index 0000000000..81bc5a50b8
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-aarch64/beta
@@ -0,0 +1,10 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Android
+ac_add_options --target=aarch64-linux-android
+
+ac_add_options --with-branding=mobile/android/branding/beta
+
+export MOZILLA_OFFICIAL=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-aarch64/debug b/mobile/android/config/mozconfigs/android-aarch64/debug
new file mode 100644
index 0000000000..b745f8d41f
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-aarch64/debug
@@ -0,0 +1,13 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Global options
+ac_add_options --enable-debug
+
+# Android
+ac_add_options --target=aarch64-linux-android
+
+export MOZILLA_OFFICIAL=1
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-aarch64/debug-beta b/mobile/android/config/mozconfigs/android-aarch64/debug-beta
new file mode 100644
index 0000000000..e592b75247
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-aarch64/debug-beta
@@ -0,0 +1,13 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Global options
+ac_add_options --enable-debug
+
+# Android
+ac_add_options --target=aarch64-linux-android
+
+export MOZILLA_OFFICIAL=1
+
+ac_add_options --with-branding=mobile/android/branding/beta
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-aarch64/debug-lite b/mobile/android/config/mozconfigs/android-aarch64/debug-lite
new file mode 100644
index 0000000000..baf668cee5
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-aarch64/debug-lite
@@ -0,0 +1,7 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+ac_add_options --enable-geckoview-lite
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-aarch64/debug"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly b/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
new file mode 100644
index 0000000000..4f33a0580d
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
@@ -0,0 +1,23 @@
+NO_NDK=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-aarch64/nightly"
+
+# L10n
+
+# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
+# Bug 1283438
+mk_add_options AUTOCLOBBER=
+
+. "$topsrcdir/build/mozconfig.no-compile"
+
+# Global options
+ac_add_options --disable-tests
+ac_add_options --disable-nodejs
+unset NODEJS
+
+ac_add_options --enable-updater
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly-lite b/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly-lite
new file mode 100644
index 0000000000..68a76fa51e
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly-lite
@@ -0,0 +1,7 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-aarch64/nightly-lite"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-aarch64/nightly b/mobile/android/config/mozconfigs/android-aarch64/nightly
new file mode 100644
index 0000000000..67fb41475d
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-aarch64/nightly
@@ -0,0 +1,10 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Android
+ac_add_options --target=aarch64-linux-android
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+export MOZILLA_OFFICIAL=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-aarch64/nightly-artifact b/mobile/android/config/mozconfigs/android-aarch64/nightly-artifact
new file mode 100644
index 0000000000..83de907ee6
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-aarch64/nightly-artifact
@@ -0,0 +1,12 @@
+. "$topsrcdir/build/mozconfig.artifact.automation"
+
+NO_CACHE=1
+NO_NDK=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-aarch64/nightly"
+
+. "$topsrcdir/build/mozconfig.artifact"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-aarch64/nightly-artifact-lite b/mobile/android/config/mozconfigs/android-aarch64/nightly-artifact-lite
new file mode 100644
index 0000000000..88b43b841c
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-aarch64/nightly-artifact-lite
@@ -0,0 +1,11 @@
+. "$topsrcdir/build/mozconfig.artifact.automation"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-aarch64/nightly-artifact"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-aarch64/nightly-lite"
+
+. "$topsrcdir/build/mozconfig.artifact"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-aarch64/nightly-lite b/mobile/android/config/mozconfigs/android-aarch64/nightly-lite
new file mode 100644
index 0000000000..c1d3b71b0d
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-aarch64/nightly-lite
@@ -0,0 +1,7 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+ac_add_options --enable-geckoview-lite
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-aarch64/nightly"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/base b/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/base
new file mode 100644
index 0000000000..d246cf24d7
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/base
@@ -0,0 +1,40 @@
+# Many things aren't appropriate for a frontend-only build.
+MOZ_AUTOMATION_BUILD_SYMBOLS=0
+MOZ_AUTOMATION_PACKAGE=0
+MOZ_AUTOMATION_UPLOAD=0
+MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0
+
+NO_CACHE=1
+NO_NDK=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# We want to download Gradle.
+ac_add_options --with-gradle
+# We want to use (and populate!) the local Nexus repositories.
+export GRADLE_MAVEN_REPOSITORIES="http://localhost:8081/nexus/content/repositories/mozilla/","http://localhost:8081/nexus/content/repositories/google/","http://localhost:8081/nexus/content/repositories/central/","http://localhost:8081/nexus/content/repositories/gradle-plugins/"
+# Nexus runs on HTTP
+ac_add_options --allow-insecure-gradle-repositories
+
+# From here on, just like ../android-arm/nightly.
+
+. "$topsrcdir/build/mozconfig.no-compile"
+
+ac_add_options --target=arm-linux-androideabi
+
+ac_add_options --disable-tests
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+export MOZILLA_OFFICIAL=1
+
+# mozconfigs/common.override would be here, but it needs to be last in the file.
+# End ../android-arm/nightly.
+
+# Disable Keyfile Loading (and checks) since dependency fetching doesn't need these keys.
+# This overrides the settings in the common android mozconfig
+ac_add_options --without-mozilla-api-keyfile
+ac_add_options --without-google-location-service-api-keyfile
+ac_add_options --without-google-safebrowsing-api-keyfile
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/nightly b/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/nightly
new file mode 100644
index 0000000000..17eb2d53be
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/nightly
@@ -0,0 +1,7 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/build/mozconfig.no-compile"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/base"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/nightly-lite b/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/nightly-lite
new file mode 100644
index 0000000000..b6ce2a3e3b
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/nightly-lite
@@ -0,0 +1,10 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/build/mozconfig.no-compile"
+
+# Android
+ac_add_options --enable-geckoview-lite
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/base"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-arm/beta b/mobile/android/config/mozconfigs/android-arm/beta
new file mode 100644
index 0000000000..6d76977c94
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-arm/beta
@@ -0,0 +1,10 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Android
+ac_add_options --target=arm-linux-androideabi
+
+ac_add_options --with-branding=mobile/android/branding/beta
+
+export MOZILLA_OFFICIAL=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-arm/debug b/mobile/android/config/mozconfigs/android-arm/debug
new file mode 100644
index 0000000000..baa3290944
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-arm/debug
@@ -0,0 +1,16 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Global options
+ac_add_options --enable-debug
+
+# Android
+ac_add_options --target=arm-linux-androideabi
+
+export MOZILLA_OFFICIAL=1
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+# Workaround gold bug (see bug 1807993)
+ac_add_options --enable-linker=lld
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-arm/debug-beta b/mobile/android/config/mozconfigs/android-arm/debug-beta
new file mode 100644
index 0000000000..ca8697c647
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-arm/debug-beta
@@ -0,0 +1,13 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Global options
+ac_add_options --enable-debug
+
+# Android
+ac_add_options --target=arm-linux-androideabi
+
+export MOZILLA_OFFICIAL=1
+
+ac_add_options --with-branding=mobile/android/branding/beta
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-arm/debug-ccov b/mobile/android/config/mozconfigs/android-arm/debug-ccov
new file mode 100644
index 0000000000..9dc98f1971
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-arm/debug-ccov
@@ -0,0 +1,21 @@
+. "$topsrcdir/build/mozconfig.artifact.automation"
+
+NO_CACHE=1
+NO_NDK=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Global options
+ac_add_options --enable-debug
+ac_add_options --enable-java-coverage
+
+# Android
+ac_add_options --target=arm-linux-androideabi
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-arm/debug"
+
+. "$topsrcdir/build/mozconfig.artifact"
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-arm/debug-ccov-lite b/mobile/android/config/mozconfigs/android-arm/debug-ccov-lite
new file mode 100644
index 0000000000..04bc844085
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-arm/debug-ccov-lite
@@ -0,0 +1,22 @@
+. "$topsrcdir/build/mozconfig.artifact.automation"
+
+NO_CACHE=1
+NO_NDK=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Global options
+ac_add_options --enable-debug
+ac_add_options --enable-java-coverage
+
+# Android
+ac_add_options --target=arm-linux-androideabi
+ac_add_options --enable-geckoview-lite
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-arm/debug"
+
+. "$topsrcdir/build/mozconfig.artifact"
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-arm/debug-lite b/mobile/android/config/mozconfigs/android-arm/debug-lite
new file mode 100644
index 0000000000..be2a05fe59
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-arm/debug-lite
@@ -0,0 +1,14 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Global options
+ac_add_options --enable-debug
+
+# Android
+ac_add_options --target=arm-linux-androideabi
+ac_add_options --enable-geckoview-lite
+
+export MOZILLA_OFFICIAL=1
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-arm/debug-searchfox b/mobile/android/config/mozconfigs/android-arm/debug-searchfox
new file mode 100644
index 0000000000..2eb2259917
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-arm/debug-searchfox
@@ -0,0 +1,18 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Global options
+ac_add_options --enable-debug
+
+# Android
+ac_add_options --target=arm-linux-androideabi
+
+export MOZILLA_OFFICIAL=1
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+# Workaround gold bug (see bug 1807993)
+ac_add_options --enable-linker=lld
+
+ac_add_options --enable-mozsearch-plugin
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-arm/l10n-nightly b/mobile/android/config/mozconfigs/android-arm/l10n-nightly
new file mode 100644
index 0000000000..62e02bcc3e
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-arm/l10n-nightly
@@ -0,0 +1,23 @@
+NO_NDK=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-arm/nightly"
+
+# L10n
+
+# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
+# Bug 1283438
+mk_add_options AUTOCLOBBER=
+
+. "$topsrcdir/build/mozconfig.no-compile"
+
+# Global options
+ac_add_options --disable-tests
+ac_add_options --disable-nodejs
+unset NODEJS
+
+ac_add_options --enable-updater
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-arm/l10n-nightly-lite b/mobile/android/config/mozconfigs/android-arm/l10n-nightly-lite
new file mode 100644
index 0000000000..21d7fe55a3
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-arm/l10n-nightly-lite
@@ -0,0 +1,9 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-arm/nightly-lite"
+
+. "$topsrcdir/build/mozconfig.no-compile"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-arm/l10n-nightly"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-arm/nightly b/mobile/android/config/mozconfigs/android-arm/nightly
new file mode 100644
index 0000000000..c9232056e5
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-arm/nightly
@@ -0,0 +1,10 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Android
+ac_add_options --target=arm-linux-androideabi
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+export MOZILLA_OFFICIAL=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-arm/nightly-android-lints b/mobile/android/config/mozconfigs/android-arm/nightly-android-lints
new file mode 100644
index 0000000000..094ca33ebd
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-arm/nightly-android-lints
@@ -0,0 +1,34 @@
+# Many things aren't appropriate for a frontend-only build.
+MOZ_AUTOMATION_BUILD_SYMBOLS=0
+MOZ_AUTOMATION_PACKAGE=0
+MOZ_AUTOMATION_UPLOAD=0
+MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0
+
+NO_CACHE=1
+NO_NDK=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/build/mozconfig.no-compile"
+
+ac_add_options --disable-tests
+
+# From here on, like ../android-arm/nightly.
+
+# Android
+ac_add_options --target=arm-linux-androideabi
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+export MOZILLA_OFFICIAL=1
+
+# mozconfigs/common.override would be here, but it needs to be last in the file.
+# End ../android-arm/nightly.
+
+# Disable Keyfile Loading (and checks) since.
+# This overrides the settings in the common android mozconfig
+ac_add_options --without-mozilla-api-keyfile
+ac_add_options --without-google-location-service-api-keyfile
+ac_add_options --without-google-safebrowsing-api-keyfile
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-arm/nightly-android-lints-lite b/mobile/android/config/mozconfigs/android-arm/nightly-android-lints-lite
new file mode 100644
index 0000000000..bb0410e077
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-arm/nightly-android-lints-lite
@@ -0,0 +1,35 @@
+# Many things aren't appropriate for a frontend-only build.
+MOZ_AUTOMATION_BUILD_SYMBOLS=0
+MOZ_AUTOMATION_PACKAGE=0
+MOZ_AUTOMATION_UPLOAD=0
+MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0
+
+NO_CACHE=1
+NO_NDK=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/build/mozconfig.no-compile"
+
+ac_add_options --disable-tests
+
+# From here on, like ../android-arm/nightly.
+
+# Android
+ac_add_options --target=arm-linux-androideabi
+ac_add_options --enable-geckoview-lite
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+export MOZILLA_OFFICIAL=1
+
+# mozconfigs/common.override would be here, but it needs to be last in the file.
+# End ../android-arm/nightly.
+
+# Disable Keyfile Loading (and checks) since.
+# This overrides the settings in the common android mozconfig
+ac_add_options --without-mozilla-api-keyfile
+ac_add_options --without-google-location-service-api-keyfile
+ac_add_options --without-google-safebrowsing-api-keyfile
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-arm/nightly-lite b/mobile/android/config/mozconfigs/android-arm/nightly-lite
new file mode 100644
index 0000000000..46172b8f62
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-arm/nightly-lite
@@ -0,0 +1,11 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Android
+ac_add_options --target=arm-linux-androideabi
+ac_add_options --enable-geckoview-lite
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+export MOZILLA_OFFICIAL=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86/beta b/mobile/android/config/mozconfigs/android-x86/beta
new file mode 100644
index 0000000000..a8c55fe00e
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86/beta
@@ -0,0 +1,9 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+ac_add_options --target=i686-linux-android
+
+ac_add_options --with-branding=mobile/android/branding/beta
+
+export MOZILLA_OFFICIAL=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86/debug b/mobile/android/config/mozconfigs/android-x86/debug
new file mode 100644
index 0000000000..6b0e7a859e
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86/debug
@@ -0,0 +1,13 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Global options
+ac_add_options --enable-debug
+
+# Android
+ac_add_options --target=i686-linux-android
+
+export MOZILLA_OFFICIAL=1
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86/debug-beta b/mobile/android/config/mozconfigs/android-x86/debug-beta
new file mode 100644
index 0000000000..4b434be736
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86/debug-beta
@@ -0,0 +1,13 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Global options
+ac_add_options --enable-debug
+
+# Android
+ac_add_options --target=i686-linux-android
+
+export MOZILLA_OFFICIAL=1
+
+ac_add_options --with-branding=mobile/android/branding/beta
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86/debug-lite b/mobile/android/config/mozconfigs/android-x86/debug-lite
new file mode 100644
index 0000000000..20fe5b3c9e
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86/debug-lite
@@ -0,0 +1,14 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Global options
+ac_add_options --enable-debug
+
+# Android
+ac_add_options --target=i686-linux-android
+ac_add_options --enable-geckoview-lite
+
+export MOZILLA_OFFICIAL=1
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86/l10n-nightly b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
new file mode 100644
index 0000000000..04844c52d4
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
@@ -0,0 +1,23 @@
+NO_NDK=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86/nightly"
+
+# L10n
+
+# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
+# Bug 1283438
+mk_add_options AUTOCLOBBER=
+
+. "$topsrcdir/build/mozconfig.no-compile"
+
+# Global options
+ac_add_options --disable-tests
+ac_add_options --disable-nodejs
+unset NODEJS
+
+ac_add_options --enable-updater
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86/l10n-nightly-lite b/mobile/android/config/mozconfigs/android-x86/l10n-nightly-lite
new file mode 100644
index 0000000000..8f94e40df8
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly-lite
@@ -0,0 +1,9 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86/nightly-lite"
+
+. "$topsrcdir/build/mozconfig.no-compile"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86/l10n-nightly"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86/nightly b/mobile/android/config/mozconfigs/android-x86/nightly
new file mode 100644
index 0000000000..fcc7615615
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86/nightly
@@ -0,0 +1,10 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Android
+ac_add_options --target=i686-linux-android
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+export MOZILLA_OFFICIAL=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86/nightly-artifact b/mobile/android/config/mozconfigs/android-x86/nightly-artifact
new file mode 100644
index 0000000000..09fefe23f7
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86/nightly-artifact
@@ -0,0 +1,12 @@
+. "$topsrcdir/build/mozconfig.artifact.automation"
+
+NO_CACHE=1
+NO_NDK=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86/nightly"
+
+. "$topsrcdir/build/mozconfig.artifact"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86/nightly-artifact-lite b/mobile/android/config/mozconfigs/android-x86/nightly-artifact-lite
new file mode 100644
index 0000000000..0def1723a3
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86/nightly-artifact-lite
@@ -0,0 +1,12 @@
+. "$topsrcdir/build/mozconfig.artifact.automation"
+
+NO_CACHE=1
+NO_NDK=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86/nightly-lite"
+
+. "$topsrcdir/build/mozconfig.artifact"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86/nightly-lite b/mobile/android/config/mozconfigs/android-x86/nightly-lite
new file mode 100644
index 0000000000..9290c12df7
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86/nightly-lite
@@ -0,0 +1,11 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Android
+ac_add_options --target=i686-linux-android
+ac_add_options --enable-geckoview-lite
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+export MOZILLA_OFFICIAL=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86/profile-generate b/mobile/android/config/mozconfigs/android-x86/profile-generate
new file mode 100644
index 0000000000..2ba606187d
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86/profile-generate
@@ -0,0 +1,6 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86/nightly"
+
+mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
+
+ac_add_options --enable-profile-generate=cross
+ac_add_options --disable-tests
diff --git a/mobile/android/config/mozconfigs/android-x86_64/beta b/mobile/android/config/mozconfigs/android-x86_64/beta
new file mode 100644
index 0000000000..43981a416f
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86_64/beta
@@ -0,0 +1,10 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Android
+ac_add_options --target=x86_64-linux-android
+
+ac_add_options --with-branding=mobile/android/branding/beta
+
+export MOZILLA_OFFICIAL=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86_64/debug b/mobile/android/config/mozconfigs/android-x86_64/debug
new file mode 100644
index 0000000000..cfd951ce9d
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86_64/debug
@@ -0,0 +1,13 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Global options
+ac_add_options --enable-debug
+
+# Android
+ac_add_options --target=x86_64-linux-android
+
+export MOZILLA_OFFICIAL=1
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86_64/debug-beta b/mobile/android/config/mozconfigs/android-x86_64/debug-beta
new file mode 100644
index 0000000000..be4f930022
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86_64/debug-beta
@@ -0,0 +1,13 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Global options
+ac_add_options --enable-debug
+
+# Android
+ac_add_options --target=x86_64-linux-android
+
+export MOZILLA_OFFICIAL=1
+
+ac_add_options --with-branding=mobile/android/branding/beta
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86_64/debug-fuzzing b/mobile/android/config/mozconfigs/android-x86_64/debug-fuzzing
new file mode 100644
index 0000000000..54cb818f5e
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86_64/debug-fuzzing
@@ -0,0 +1,11 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/debug"
+
+# Disable Telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
+
+ac_add_options --enable-fuzzing
+
+# This adds '-fuzzing' to the APK filename for local builds.
+export MOZ_PKG_SPECIAL=fuzzing
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86_64/debug-fuzzing-lite b/mobile/android/config/mozconfigs/android-x86_64/debug-fuzzing-lite
new file mode 100644
index 0000000000..4fc59444aa
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86_64/debug-fuzzing-lite
@@ -0,0 +1,5 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/debug-lite"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/debug-fuzzing"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86_64/debug-isolated-process b/mobile/android/config/mozconfigs/android-x86_64/debug-isolated-process
new file mode 100644
index 0000000000..c166becf72
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86_64/debug-isolated-process
@@ -0,0 +1,15 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Global options
+ac_add_options --enable-debug
+
+# Android
+ac_add_options --with-android-min-sdk=21
+ac_add_options --target=x86_64-linux-android
+
+export MOZILLA_OFFICIAL=1
+export MOZ_ANDROID_CONTENT_SERVICE_ISOLATED_PROCESS=1
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
\ No newline at end of file
diff --git a/mobile/android/config/mozconfigs/android-x86_64/debug-lite b/mobile/android/config/mozconfigs/android-x86_64/debug-lite
new file mode 100644
index 0000000000..ef97701075
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86_64/debug-lite
@@ -0,0 +1,7 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+ac_add_options --enable-geckoview-lite
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/debug"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86_64/l10n-nightly b/mobile/android/config/mozconfigs/android-x86_64/l10n-nightly
new file mode 100644
index 0000000000..c9c6894790
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86_64/l10n-nightly
@@ -0,0 +1,23 @@
+NO_NDK=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly"
+
+# L10n
+
+# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
+# Bug 1283438
+mk_add_options AUTOCLOBBER=
+
+. "$topsrcdir/build/mozconfig.no-compile"
+
+# Global options
+ac_add_options --disable-tests
+ac_add_options --disable-nodejs
+unset NODEJS
+
+ac_add_options --enable-updater
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86_64/l10n-nightly-lite b/mobile/android/config/mozconfigs/android-x86_64/l10n-nightly-lite
new file mode 100644
index 0000000000..c39db1107d
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86_64/l10n-nightly-lite
@@ -0,0 +1,7 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/l10n-nightly"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly-lite"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86_64/nightly b/mobile/android/config/mozconfigs/android-x86_64/nightly
new file mode 100644
index 0000000000..457d93d4d3
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86_64/nightly
@@ -0,0 +1,10 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Android
+ac_add_options --target=x86_64-linux-android
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+export MOZILLA_OFFICIAL=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86_64/nightly-artifact b/mobile/android/config/mozconfigs/android-x86_64/nightly-artifact
new file mode 100644
index 0000000000..a56061dccd
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86_64/nightly-artifact
@@ -0,0 +1,12 @@
+. "$topsrcdir/build/mozconfig.artifact.automation"
+
+NO_CACHE=1
+NO_NDK=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly"
+
+. "$topsrcdir/build/mozconfig.artifact"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86_64/nightly-artifact-lite b/mobile/android/config/mozconfigs/android-x86_64/nightly-artifact-lite
new file mode 100644
index 0000000000..cc0918045c
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86_64/nightly-artifact-lite
@@ -0,0 +1,12 @@
+. "$topsrcdir/build/mozconfig.artifact.automation"
+
+NO_CACHE=1
+NO_NDK=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly-lite"
+
+. "$topsrcdir/build/mozconfig.artifact"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan b/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan
new file mode 100644
index 0000000000..4a63f438bf
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan
@@ -0,0 +1,29 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly"
+
+# Remove unwanted environment variables from the 'nightly' mozconfig.
+unset MOZ_ANDROID_POCKET
+
+# We still need to build with debug symbols
+ac_add_options --disable-debug
+ac_add_options --enable-optimize="-O2 -gline-tables-only"
+
+. $topsrcdir/build/unix/mozconfig.asan
+ac_add_options --disable-elf-hack
+
+ac_add_options --enable-fuzzing
+unset MOZ_STDCXX_COMPAT
+unset ENABLE_CLANG_PLUGIN
+
+# Add the path to the clang_rt used, so it can be packaged with the build.
+if [ -d "$MOZ_FETCHES_DIR/clang" ]; then
+    CLANG_LIB_DIR="$(cd $MOZ_FETCHES_DIR/clang/lib/clang/*/lib/linux && pwd)"
+    export MOZ_CLANG_RT_ASAN_LIB_PATH="${CLANG_LIB_DIR}/libclang_rt.asan-x86_64-android.so"
+fi
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
+
+# This adds '-fuzzing-asan' to the APK filename for local builds.
+export MOZ_PKG_SPECIAL=fuzzing-asan
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan-lite b/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan-lite
new file mode 100644
index 0000000000..beb35d13d8
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan-lite
@@ -0,0 +1,5 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly-lite"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86_64/nightly-lite b/mobile/android/config/mozconfigs/android-x86_64/nightly-lite
new file mode 100644
index 0000000000..abdb120300
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86_64/nightly-lite
@@ -0,0 +1,7 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+ac_add_options --enable-geckoview-lite
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86_64/profile-generate b/mobile/android/config/mozconfigs/android-x86_64/profile-generate
new file mode 100644
index 0000000000..0bd9464da6
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-x86_64/profile-generate
@@ -0,0 +1,6 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly"
+
+mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
+
+ac_add_options --enable-profile-generate=cross
+ac_add_options --disable-tests
diff --git a/mobile/android/config/mozconfigs/common b/mobile/android/config/mozconfigs/common
new file mode 100644
index 0000000000..32b8b1b564
--- /dev/null
+++ b/mobile/android/config/mozconfigs/common
@@ -0,0 +1,37 @@
+# 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/.
+
+. "$topsrcdir/build/mozconfig.common"
+
+# Build Fennec
+ac_add_options --enable-project=mobile/android
+
+ac_add_options --with-gradle="$MOZ_FETCHES_DIR/android-gradle-dependencies/gradle-dist/bin/gradle"
+export GRADLE_MAVEN_REPOSITORIES="file://$MOZ_FETCHES_DIR/android-gradle-dependencies/mozilla","file://$MOZ_FETCHES_DIR/android-gradle-dependencies/google","file://$MOZ_FETCHES_DIR/android-gradle-dependencies/central","file://$MOZ_FETCHES_DIR/android-gradle-dependencies/gradle-plugins"
+
+if [ -z "$NO_NDK" -a -z "$USE_ARTIFACT" ]; then
+    CFLAGS="$CFLAGS -fcrash-diagnostics-dir=${UPLOAD_PATH}"
+    CXXFLAGS="$CXXFLAGS -fcrash-diagnostics-dir=${UPLOAD_PATH}"
+    # Make sure that any host binaries we build use whatever libraries clang
+    # linked against, rather than what's on the system.
+    mk_add_options "export LD_LIBRARY_PATH=$MOZ_FETCHES_DIR/clang/lib"
+    # Enable static analysis plugin
+    export ENABLE_CLANG_PLUGIN=1
+fi
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+
+ac_add_options --with-google-safebrowsing-api-keyfile=/builds/sb-gapi.data
+ac_add_options --with-google-location-service-api-keyfile=/builds/gls-gapi.data
+ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-fennec-geoloc-api.key
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
+
+if [ -d "$MOZ_FETCHES_DIR/binutils/bin" ]; then
+    mk_add_options "export PATH=$MOZ_FETCHES_DIR/binutils/bin:$PATH"
+    export LDFLAGS="$LDFLAGS -B $MOZ_FETCHES_DIR/binutils/bin"
+fi
+
+JS_BINARY="$topsrcdir/mobile/android/config/js_wrapper.sh"
diff --git a/mobile/android/config/mozconfigs/common.override b/mobile/android/config/mozconfigs/common.override
new file mode 100644
index 0000000000..1213a82f70
--- /dev/null
+++ b/mobile/android/config/mozconfigs/common.override
@@ -0,0 +1,10 @@
+# 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 at the bottom of all native android mozconfigs
+#
+# Disable enforcing that add-ons are signed by the trusted root
+MOZ_REQUIRE_SIGNING=
+
+. "$topsrcdir/build/mozconfig.common.override"