Bug 1709640 - Add GeckoView Lite build variant. r=jmaher,aklotz,mhentges,glandium

This patch adds a new GeckoView build variant dubbed "lite". We are in the process of adding some optional dependencies to GeckoView that are needed by Fenix (like Glean and Nimbus) which are likely not going to be used by anyone else at Mozilla. To avoid bloating third party consumers, we provide a geckoview-lite build that doesn't contain any optional dependency. The min SDK version of GeckoView (non-lite) is being increased to 21 to match Glean's min SDK. Given that Fenix's min SDK version is already 21 and that the lite version's min SDK is still at 16 this change is safe to do and will not incur in any loss of usability. Differential Revision: https://phabricator.services.mozilla.com/D114370
2021-07-20 03:23:32 +00:00 · 2021-07-20 03:23:32 +00:00 · 4c9aa8ef11
--- a/mobile/android/config/mozconfigs/android-aarch64/beta
+++ b/mobile/android/config/mozconfigs/android-aarch64/beta
@ -1,7 +1,6 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"

 # Android
-ac_add_options --with-android-min-sdk=21
 ac_add_options --target=aarch64-linux-android

 ac_add_options --with-branding=mobile/android/branding/beta
--- a/mobile/android/config/mozconfigs/android-aarch64/debug
+++ b/mobile/android/config/mozconfigs/android-aarch64/debug
@ -4,7 +4,6 @@
 ac_add_options --enable-debug

 # Android
-ac_add_options --with-android-min-sdk=21
 ac_add_options --target=aarch64-linux-android

 export MOZILLA_OFFICIAL=1
--- a/mobile/android/config/mozconfigs/android-aarch64/debug-beta
+++ b/mobile/android/config/mozconfigs/android-aarch64/debug-beta
@ -4,7 +4,6 @@
 ac_add_options --enable-debug

 # Android
-ac_add_options --with-android-min-sdk=21
 ac_add_options --target=aarch64-linux-android

 export MOZILLA_OFFICIAL=1
--- a/mobile/android/config/mozconfigs/android-aarch64/debug-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-aarch64/nightly
+++ b/mobile/android/config/mozconfigs/android-aarch64/nightly
@ -1,7 +1,6 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"

 # Android
-ac_add_options --with-android-min-sdk=21
 ac_add_options --target=aarch64-linux-android

 ac_add_options --with-branding=mobile/android/branding/nightly
--- a/mobile/android/config/mozconfigs/android-aarch64/nightly-artifact-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-aarch64/nightly-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/base
+++ b/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/base
@ -0,0 +1,38 @@
+# 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/google/","http://localhost:8081/nexus/content/repositories/central/","http://localhost:8081/nexus/content/repositories/gradle-plugins/"
+
+# 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"
--- a/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/nightly
+++ b/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/nightly
@ -1,45 +1,7 @@
-# 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/google/","http://localhost:8081/nexus/content/repositories/central/","http://localhost:8081/nexus/content/repositories/gradle-plugins/"
-
-# From here on, just like ../android-arm/nightly.
-
 . "$topsrcdir/build/mozconfig.no-compile"

-ac_add_options --disable-tests
-
-# Android
-# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
-# of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
-# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
-# If you think you can't handle the whole set of changes, please reach out to the Release
-# Engineering team.
-ac_add_options --with-android-min-sdk=16
-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 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/android-arm-gradle-dependencies/base"

 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/nightly-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-arm/beta
+++ b/mobile/android/config/mozconfigs/android-arm/beta
@ -1,12 +1,6 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"

 # Android
-# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
-# of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
-# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
-# If you think you can't handle the whole set of changes, please reach out to the Release
-# Engineering team.
-ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi

 ac_add_options --with-branding=mobile/android/branding/beta
--- a/mobile/android/config/mozconfigs/android-arm/debug
+++ b/mobile/android/config/mozconfigs/android-arm/debug
@ -4,12 +4,6 @@
 ac_add_options --enable-debug

 # Android
-# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
-# of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
-# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
-# If you think you can't handle the whole set of changes, please reach out to the Release
-# Engineering team.
-ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi

 export MOZILLA_OFFICIAL=1
--- a/mobile/android/config/mozconfigs/android-arm/debug-beta
+++ b/mobile/android/config/mozconfigs/android-arm/debug-beta
@ -4,12 +4,6 @@
 ac_add_options --enable-debug

 # Android
-# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
-# of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
-# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
-# If you think you can't handle the whole set of changes, please reach out to the Release
-# Engineering team.
-ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi

 export MOZILLA_OFFICIAL=1
--- a/mobile/android/config/mozconfigs/android-arm/debug-ccov
+++ b/mobile/android/config/mozconfigs/android-arm/debug-ccov
@ -10,12 +10,6 @@ ac_add_options --enable-debug
 ac_add_options --enable-java-coverage

 # Android
-# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
-# of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
-# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
-# If you think you can't handle the whole set of changes, please reach out to the Release
-# Engineering team.
-ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi

 . "$topsrcdir/mobile/android/config/mozconfigs/android-arm/debug"
--- a/mobile/android/config/mozconfigs/android-arm/debug-ccov-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-arm/debug-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-arm/debug-searchfox
+++ b/mobile/android/config/mozconfigs/android-arm/debug-searchfox
@ -4,12 +4,6 @@
 ac_add_options --enable-debug

 # Android
-# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
-# of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
-# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
-# If you think you can't handle the whole set of changes, please reach out to the Release
-# Engineering team.
-ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi

 export MOZILLA_OFFICIAL=1
--- a/mobile/android/config/mozconfigs/android-arm/l10n-nightly-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-arm/nightly
+++ b/mobile/android/config/mozconfigs/android-arm/nightly
@ -1,12 +1,6 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"

 # Android
-# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
-# of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
-# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
-# If you think you can't handle the whole set of changes, please reach out to the Release
-# Engineering team.
-ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi

 ac_add_options --with-branding=mobile/android/branding/nightly
--- a/mobile/android/config/mozconfigs/android-arm/nightly-android-lints
+++ b/mobile/android/config/mozconfigs/android-arm/nightly-android-lints
@ -16,12 +16,6 @@ ac_add_options --disable-tests
 # From here on, like ../android-arm/nightly.

 # Android
-# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
-# of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
-# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
-# If you think you can't handle the whole set of changes, please reach out to the Release
-# Engineering team.
-ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi

 ac_add_options --with-branding=mobile/android/branding/nightly
--- a/mobile/android/config/mozconfigs/android-arm/nightly-android-lints-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-arm/nightly-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-x86/beta
+++ b/mobile/android/config/mozconfigs/android-x86/beta
@ -1,12 +1,6 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"

-# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
-# of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
-# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
-# If you think you can't handle the whole set of changes, please reach out to the Release
-# Engineering team.
 ac_add_options --target=i686-linux-android
-ac_add_options --with-android-min-sdk=16

 ac_add_options --with-branding=mobile/android/branding/beta

--- a/mobile/android/config/mozconfigs/android-x86/debug
+++ b/mobile/android/config/mozconfigs/android-x86/debug
@ -4,12 +4,6 @@
 ac_add_options --enable-debug

 # Android
-# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
-# of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
-# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
-# If you think you can't handle the whole set of changes, please reach out to the Release
-# Engineering team.
-ac_add_options --with-android-min-sdk=16
 ac_add_options --target=i686-linux-android

 export MOZILLA_OFFICIAL=1
--- a/mobile/android/config/mozconfigs/android-x86/debug-beta
+++ b/mobile/android/config/mozconfigs/android-x86/debug-beta
@ -4,12 +4,6 @@
 ac_add_options --enable-debug

 # Android
-# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
-# of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
-# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
-# If you think you can't handle the whole set of changes, please reach out to the Release
-# Engineering team.
-ac_add_options --with-android-min-sdk=16
 ac_add_options --target=i686-linux-android

 export MOZILLA_OFFICIAL=1
--- a/mobile/android/config/mozconfigs/android-x86/debug-fuzzing-lite
+++ b/mobile/android/config/mozconfigs/android-x86/debug-fuzzing-lite
@ -0,0 +1,5 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86/debug-lite"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86/debug-fuzzing"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86/debug-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-x86/l10n-nightly-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-x86/nightly
+++ b/mobile/android/config/mozconfigs/android-x86/nightly
@ -1,12 +1,6 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"

 # Android
-# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
-# of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
-# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
-# If you think you can't handle the whole set of changes, please reach out to the Release
-# Engineering team.
-ac_add_options --with-android-min-sdk=16
 ac_add_options --target=i686-linux-android

 ac_add_options --with-branding=mobile/android/branding/nightly
--- a/mobile/android/config/mozconfigs/android-x86/nightly-artifact-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-x86/nightly-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-x86_64/beta
+++ b/mobile/android/config/mozconfigs/android-x86_64/beta
@ -1,7 +1,6 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"

 # Android
-ac_add_options --with-android-min-sdk=21
 ac_add_options --target=x86_64-linux-android

 ac_add_options --with-branding=mobile/android/branding/beta
--- a/mobile/android/config/mozconfigs/android-x86_64/debug
+++ b/mobile/android/config/mozconfigs/android-x86_64/debug
@ -4,7 +4,6 @@
 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
--- a/mobile/android/config/mozconfigs/android-x86_64/debug-beta
+++ b/mobile/android/config/mozconfigs/android-x86_64/debug-beta
@ -4,7 +4,6 @@
 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
--- a/mobile/android/config/mozconfigs/android-x86_64/debug-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-x86_64/l10n-nightly-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-x86_64/nightly
+++ b/mobile/android/config/mozconfigs/android-x86_64/nightly
@ -1,7 +1,6 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"

 # Android
-ac_add_options --with-android-min-sdk=21
 ac_add_options --target=x86_64-linux-android

 ac_add_options --with-branding=mobile/android/branding/nightly
--- a/mobile/android/config/mozconfigs/android-x86_64/nightly-artifact-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan-lite
+++ 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"
--- a/mobile/android/config/mozconfigs/android-x86_64/nightly-lite
+++ 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"
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@ -12,7 +12,7 @@ MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial
 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official
 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh

-# We support Android SDK version 16 and up by default.
+# We support Android SDK version 21 and up by default (16 in lite mode).
 # See the --enable-android-min-sdk and --enable-android-max-sdk arguments in configure.in.
 # 
 # Warning: Before increasing the with-android-min-sdk value, please note several places in and out
@ -20,7 +20,11 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official
 # advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
-MOZ_ANDROID_MIN_SDK_VERSION=16
+if test "$MOZ_ANDROID_GECKOVIEW_LITE"; then
+  MOZ_ANDROID_MIN_SDK_VERSION=16
+else
+  MOZ_ANDROID_MIN_SDK_VERSION=21
+fi

 # There are several entry points into the Firefox application.  These are the names of some of the classes that are
 # listed in the Android manifest.  They are specified in here to avoid hard-coding them in source code files.
--- a/mobile/android/geckoview/build.gradle
+++ b/mobile/android/geckoview/build.gradle
@ -420,11 +420,16 @@ publishing {
                pom {
                    groupId = 'org.mozilla.geckoview'

+                    def omniSuffix = ""
+                    if (!mozconfig.substs.MOZ_ANDROID_GECKOVIEW_LITE) {
+                        omniSuffix = "-omni"
+                    }
+
                    if (mozconfig.substs.MOZ_UPDATE_CHANNEL == 'release') {
                        // Release artifacts don't specify the channel, for the sake of simplicity.
-                        artifactId = 'geckoview'
+                        artifactId = 'geckoview$omniSuffix'
                    } else {
-                        artifactId = "geckoview-${mozconfig.substs.MOZ_UPDATE_CHANNEL}"
+                        artifactId = "geckoview-${mozconfig.substs.MOZ_UPDATE_CHANNEL}$omniSuffix"
                    }

                    if (mozconfig.substs.MOZILLA_OFFICIAL && !mozconfig.substs.MOZ_ANDROID_FAT_AAR_ARCHITECTURES) {
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@ -50,6 +50,16 @@ set_config(
    depends_if("MOZ_ANDROID_CONTENT_SERVICE_ISOLATED_PROCESS")(lambda x: True),
 )

+option(
+    "--enable-geckoview-lite",
+    help="Build GeckoView in Lite mode. Lite mode removes all unnecessary dependencies like Glean.",
+)
+
+set_config("MOZ_ANDROID_GECKOVIEW_LITE", True, when="--enable-geckoview-lite")
+add_old_configure_assignment(
+    "MOZ_ANDROID_GECKOVIEW_LITE", True, when="--enable-geckoview-lite"
+)
+
 imply_option("MOZ_NORMANDY", False)
 imply_option("MOZ_SERVICES_HEALTHREPORT", True)
 imply_option("MOZ_ANDROID_HISTORY", True)
--- a/substitute-local-geckoview.gradle
+++ b/substitute-local-geckoview.gradle
@ -93,6 +93,19 @@ configurations.all { config ->
        'geckoview-beta-x86_64',
    ]

+    def geckoviewOmniModules = [
+        'geckoview-nightly-omni',
+        'geckoview-nightly-omni-armeabi-v7a',
+        'geckoview-nightly-omni-arm64-v8a',
+        'geckoview-nightly-omni-x86',
+        'geckoview-nightly-omni-x86_64',
+        'geckoview-beta-omni',
+        'geckoview-beta-omni-armeabi-v7a',
+        'geckoview-beta-omni-arm64-v8a',
+        'geckoview-beta-omni-x86',
+        'geckoview-beta-omni-x86_64',
+    ]
+
    if (config.isCanBeResolved()) {
        config.resolutionStrategy { strategy ->
            dependencySubstitution {
@ -107,8 +120,15 @@ configurations.all { config ->
                    }

                    def group = dependency.requested.group
-                    if (group == 'org.mozilla.geckoview' && geckoviewModules.contains(dependency.requested.module)) {
-                        def name = 'geckoview-default'
+                    def module = dependency.requested.module
+                    if (group == 'org.mozilla.geckoview'
+                          && (geckoviewModules.contains(module) || geckoviewOmniModules.contains(module))) {
+                        def name = ''
+                        if (geckoviewOmniModules.contains(module)) {
+                          name = 'geckoview-default-omni'
+                        } else {
+                          name = 'geckoview-default'
+                        }
                        log("Substituting ${group}:${dependency.requested.module} with local GeckoView ${group}:${name} in ${config}")

                        dependency.useTarget([group: group, name: name, version: '+'])
--- a/taskcluster/ci/build-fat-aar/kind.yml
+++ b/taskcluster/ci/build-fat-aar/kind.yml
@ -92,7 +92,7 @@ jobs:
            job-name: android-geckoview-fat-aar-opt
            type: shippable-with-multi-l10n
        treeherder:
-            platform: android-4-0-geckoview-fat-aar-shippable/opt
+            platform: android-5-0-geckoview-fat-aar-shippable/opt
            symbol: Bgv
        dependencies:
            android-x86-shippable: build-android-x86-shippable/opt
@ -109,3 +109,33 @@ jobs:
                - taskcluster_nightly.py
        optimization:
            skip-unless-backstop: null
+
+    android-geckoview-fat-aar-shippable-lite/opt:
+        description: "Android GeckoView Lite multi-architecture fat AAR Shippable"
+        attributes:
+            shippable: true
+            enable-full-crashsymbols: true
+            disable-push-apk: true
+        shipping-phase: build
+        shipping-product: fennec
+        index:
+            job-name: android-geckoview-fat-aar-opt-lite
+            type: shippable-with-multi-l10n
+        treeherder:
+            platform: android-4-1-geckoview-fat-aar-shippable/opt
+            symbol: Bgvl
+        dependencies:
+            android-x86-shippable: build-android-x86-shippable-lite/opt
+            android-x86_64-shippable: build-android-x86_64-shippable-lite/opt
+            android-arm-shippable: build-android-arm-shippable-lite/opt
+            android-aarch64-shippable: build-android-aarch64-shippable-lite/opt
+        worker:
+            env:
+                PERFHERDER_EXTRA_OPTIONS: android-geckoview-fat-aar-nightly-lite
+        run:
+            actions: [get-secrets, build, multi-l10n]
+            config:
+                - builds/releng_base_android_64_builds.py
+                - taskcluster_nightly.py
+        optimization:
+            skip-unless-backstop: null
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@ -33,7 +33,6 @@ job-defaults:
        tooltool-downloads: internal
    fetches:
        toolchain:
-            - android-gradle-dependencies
            - android-ndk-linux
            - android-sdk-linux
            - linux64-rust-android
@ -45,13 +44,13 @@ job-defaults:
            - sysroot-x86_64-linux-gnu

 android-arm/debug:
-    description: "Android 4.0 Arm Debug"
+    description: "Android 5.0 Arm Debug"
    index:
        job-name: android-arm-debug
    attributes:
        enable-full-crashsymbols: true
    treeherder:
-        platform: android-4-0-armv7/debug
+        platform: android-5-0-armv7/debug
        symbol: B
    worker-type: b-linux
    worker:
@ -67,15 +66,40 @@ android-arm/debug:
        toolchain:
            - linux64-clang
            - linux64-sccache
+            - android-gradle-dependencies
+
+android-arm-lite/debug:
+    description: "Android 4.1 Arm Debug Lite"
+    index:
+        job-name: android-arm-lite-debug
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: android-4-1-armv7/debug
+        symbol: Bl
+    worker-type: b-linux
+    worker:
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
+    run:
+        actions: [get-secrets, build]
+        config: ["builds/releng_base_android_64_builds.py"]
+        custom-build-variant-cfg: arm-lite-debug
+    use-sccache: true
+    fetches:
+        toolchain:
+            - linux64-clang
+            - linux64-sccache
+            - android-gradle-dependencies-lite

 android-x86/opt:
-    description: "Android 4.2 x86 Opt"
+    description: "Android 5.0 x86 Opt"
    index:
        job-name: android-x86-opt
    attributes:
        enable-full-crashsymbols: true
    treeherder:
-        platform: android-4-2-x86/opt
+        platform: android-5-0-x86/opt
        symbol: B
    run-on-projects: ['integration']
    worker-type: b-linux
@ -91,6 +115,33 @@ android-x86/opt:
        toolchain:
            - linux64-clang
            - linux64-sccache
+            - android-gradle-dependencies
+
+android-x86-lite/opt:
+    description: "Android 4.1 x86 Opt"
+    index:
+        job-name: android-x86-lite-opt
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: android-4-1-x86/opt
+        symbol: Bl
+    run-on-projects: ['integration']
+    worker-type: b-linux
+    worker:
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
+            PERFHERDER_EXTRA_OPTIONS: lite
+    run:
+        actions: [get-secrets, build]
+        config: ["builds/releng_base_android_64_builds.py"]
+        custom-build-variant-cfg: x86-lite
+    use-sccache: true
+    fetches:
+        toolchain:
+            - linux64-clang
+            - linux64-sccache
+            - android-gradle-dependencies-lite

 android-x86-fuzzing/debug:
    description: "Android x86 Fuzzing Debug"
@ -112,11 +163,12 @@ android-x86-fuzzing/debug:
        toolchain:
            - linux64-clang
            - linux64-sccache
+            - android-gradle-dependencies
    optimization:
        skip-unless-expanded: null

 android-x86-shippable/opt:
-    description: "Android 4.2 x86 Shippable"
+    description: "Android 5.0 x86 Shippable"
    attributes:
        enable-full-crashsymbols: true
        shippable: true
@ -126,7 +178,7 @@ android-x86-shippable/opt:
        job-name: android-x86-opt
        type: android-shippable
    treeherder:
-        platform: android-4-2-x86-shippable/opt
+        platform: android-5-0-x86-shippable/opt
        symbol: B
    run-on-projects: ['release']
    worker-type: b-linux
@ -143,15 +195,46 @@ android-x86-shippable/opt:
    fetches:
        toolchain:
            - linux64-clang
+            - android-gradle-dependencies
+
+android-x86-shippable-lite/opt:
+    description: "Android 4.1 x86 Shippable Lite"
+    attributes:
+        enable-full-crashsymbols: true
+        shippable: true
+    shipping-phase: build
+    shipping-product: fennec
+    index:
+        job-name: android-x86-lite-opt
+        type: android-shippable
+    treeherder:
+        platform: android-4-1-x86-shippable-lite/opt
+        symbol: Bl
+    run-on-projects: ['release']
+    worker-type: b-linux
+    worker:
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
+            MOZ_AUTOMATION_PACKAGE_TESTS: "1"
+    run:
+        actions: [get-secrets, build, multi-l10n]
+        config:
+            - builds/releng_base_android_64_builds.py
+            - taskcluster_nightly.py
+        custom-build-variant-cfg: x86-lite
+    fetches:
+        toolchain:
+            - linux64-clang
+            - android-gradle-dependencies-lite

 android-arm/opt:
-    description: "Android 4.0 Arm Opt"
+    description: "Android 5.0 Arm Opt"
    index:
        job-name: android-arm-opt
    attributes:
        enable-full-crashsymbols: true
    treeherder:
-        platform: android-4-0-armv7/opt
+        platform: android-5-0-armv7/opt
        symbol: B
    run-on-projects: ['integration']
    worker-type: b-linux
@ -167,10 +250,36 @@ android-arm/opt:
    fetches:
        toolchain:
            - linux64-clang
+            - android-gradle-dependencies
            - linux64-sccache

+android-arm-lite/opt:
+    description: "Android 4.1 Arm Opt Lite"
+    index:
+        job-name: android-arm-lite-opt
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: android-4-1-armv7/opt
+        symbol: Bl
+    run-on-projects: ['integration']
+    worker-type: b-linux
+    worker:
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
+    run:
+        actions: [get-secrets, build]
+        config: ["builds/releng_base_android_64_builds.py"]
+        custom-build-variant-cfg: arm-lite
+    use-sccache: true
+    fetches:
+        toolchain:
+            - linux64-clang
+            - linux64-sccache
+            - android-gradle-dependencies-lite
+
 android-arm-shippable/opt:
-    description: "Android 4.0 Arm Shippable"
+    description: "Android 5.0 Arm Shippable"
    use-pgo: android-x86-shippable/opt
    attributes:
        enable-full-crashsymbols: true
@ -181,7 +290,7 @@ android-arm-shippable/opt:
        job-name: android-arm-opt
        type: android-shippable-with-multi-l10n
    treeherder:
-        platform: android-4-0-armv7-shippable/opt
+        platform: android-5-0-armv7-shippable/opt
        symbol: Bpgo(B)
    run-on-projects: ['release']
    worker-type: b-linux
@ -200,6 +309,37 @@ android-arm-shippable/opt:
            - linux64-clang
            - android-gradle-dependencies

+android-arm-shippable-lite/opt:
+    description: "Android 4.1 Arm Shippable Lite"
+    use-pgo: android-x86-shippable/opt
+    attributes:
+        enable-full-crashsymbols: true
+        shippable: true
+    shipping-phase: build
+    shipping-product: fennec
+    index:
+        job-name: android-arm-lite-opt
+        type: android-shippable-with-multi-l10n
+    treeherder:
+        platform: android-4-1-armv7-shippable-lite/opt
+        symbol: Bpgo(Bl)
+    run-on-projects: ['release']
+    worker-type: b-linux
+    worker:
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
+            MOZ_AUTOMATION_PACKAGE_TESTS: "1"
+    run:
+        actions: [get-secrets, build, multi-l10n]
+        config:
+            - builds/releng_base_android_64_builds.py
+            - taskcluster_nightly.py
+        custom-build-variant-cfg: arm-lite
+    fetches:
+        toolchain:
+            - linux64-clang
+            - android-gradle-dependencies-lite
+
 android-aarch64/opt:
    description: "Android 5.0 AArch64 Opt"
    index:
@ -224,6 +364,33 @@ android-aarch64/opt:
        toolchain:
            - linux64-clang
            - linux64-sccache
+            - android-gradle-dependencies
+
+android-aarch64-lite/opt:
+    description: "Android 5.0 AArch64 Opt Lite"
+    index:
+        job-name: android-aarch64-lite-opt
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: android-5-0-aarch64/opt
+        symbol: Bl
+    run-on-projects: ['integration']
+    worker-type: b-linux
+    worker:
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
+            PERFHERDER_EXTRA_OPTIONS: lite
+    run:
+        actions: [get-secrets, build]
+        config: ["builds/releng_base_android_64_builds.py"]
+        custom-build-variant-cfg: aarch64-lite
+    use-sccache: true
+    fetches:
+        toolchain:
+            - linux64-clang
+            - linux64-sccache
+            - android-gradle-dependencies-lite

 android-aarch64/debug:
    description: "Android 5.0 AArch64 Debug"
@ -248,6 +415,32 @@ android-aarch64/debug:
        toolchain:
            - linux64-clang
            - linux64-sccache
+            - android-gradle-dependencies
+
+android-aarch64-lite/debug:
+    description: "Android 5.0 AArch64 Debug Lite"
+    index:
+        job-name: android-aarch64-lite-debug
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: android-5-0-aarch64/debug
+        symbol: Bl
+    worker-type: b-linux
+    worker:
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
+            PERFHERDER_EXTRA_OPTIONS: lite
+    run:
+        actions: [get-secrets, build]
+        config: ["builds/releng_base_android_64_builds.py"]
+        custom-build-variant-cfg: aarch64-lite-debug
+    use-sccache: true
+    fetches:
+        toolchain:
+            - linux64-clang
+            - linux64-sccache
+            - android-gradle-dependencies-lite

 android-aarch64-shippable/opt:
    description: "Android 5.0 AArch64 Shippable"
@ -280,6 +473,38 @@ android-aarch64-shippable/opt:
            - linux64-clang
            - android-gradle-dependencies

+android-aarch64-shippable-lite/opt:
+    description: "Android 5.0 AArch64 Shippable Lite"
+    use-pgo: android-x86_64-shippable/opt
+    attributes:
+        enable-full-crashsymbols: true
+        shippable: true
+    shipping-phase: build
+    shipping-product: fennec
+    index:
+        job-name: android-aarch64-lite-opt
+        type: android-shippable
+    treeherder:
+        platform: android-5-0-aarch64-shippable-lite/opt
+        symbol: Bpgo(Bl)
+    run-on-projects: ['release']
+    worker-type: b-linux
+    worker:
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
+            MOZ_AUTOMATION_PACKAGE_TESTS: "1"
+            PERFHERDER_EXTRA_OPTIONS: lite
+    run:
+        actions: [get-secrets, build, multi-l10n]
+        config:
+            - builds/releng_base_android_64_builds.py
+            - taskcluster_nightly.py
+        custom-build-variant-cfg: aarch64-lite
+    fetches:
+        toolchain:
+            - linux64-clang
+            - android-gradle-dependencies-lite
+
 android-x86_64/opt:
    description: "Android 5.0 x86-64 Opt"
    index:
@ -304,6 +529,34 @@ android-x86_64/opt:
        toolchain:
            - linux64-clang
            - linux64-sccache
+            - android-gradle-dependencies
+
+android-x86_64-lite/opt:
+    description: "Android 5.0 x86-64 Opt Lite"
+    index:
+        job-name: android-x86_64-lite-opt
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: android-5-0-x86_64/opt
+        symbol: Bl
+    run-on-projects: ['integration']
+    worker-type: b-linux
+    worker:
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
+            MOZ_AUTOMATION_PACKAGE_TESTS: "1"
+            PERFHERDER_EXTRA_OPTIONS: lite
+    run:
+        actions: [get-secrets, build]
+        config: ["builds/releng_base_android_64_builds.py"]
+        custom-build-variant-cfg: x86_64-lite
+    use-sccache: true
+    fetches:
+        toolchain:
+            - linux64-clang
+            - linux64-sccache
+            - android-gradle-dependencies-lite

 android-x86_64-shippable/opt:
    description: "Android 5.0 x86-64 Shippable"
@ -333,6 +586,38 @@ android-x86_64-shippable/opt:
    fetches:
        toolchain:
            - linux64-clang
+            - android-gradle-dependencies
+
+android-x86_64-shippable-lite/opt:
+    description: "Android 5.0 x86-64 Shippable Lite"
+    attributes:
+        enable-full-crashsymbols: true
+        shippable: true
+    shipping-phase: build
+    shipping-product: fennec
+    index:
+        job-name: android-x86_64-lite-opt
+        type: android-shippable
+    treeherder:
+        platform: android-5-0-x86_64-shippable-lite/opt
+        symbol: Bl
+    run-on-projects: ['release']
+    worker-type: b-linux
+    worker:
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
+            MOZ_AUTOMATION_PACKAGE_TESTS: "1"
+            PERFHERDER_EXTRA_OPTIONS: lite
+    run:
+        actions: [get-secrets, build, multi-l10n]
+        config:
+            - builds/releng_base_android_64_builds.py
+            - taskcluster_nightly.py
+        custom-build-variant-cfg: x86_64-lite
+    fetches:
+        toolchain:
+            - linux64-clang
+            - android-gradle-dependencies-lite

 android-x86_64/debug:
    description: "Android 5.0 x86-64 Debug"
@ -357,6 +642,33 @@ android-x86_64/debug:
        toolchain:
            - linux64-clang
            - linux64-sccache
+            - android-gradle-dependencies
+
+android-x86_64-lite/debug:
+    description: "Android 5.0 x86-64 Debug Lite"
+    index:
+        job-name: android-x86_64-lite-debug
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: android-5-0-x86_64/debug
+        symbol: Bl
+    worker-type: b-linux
+    worker:
+        env:
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
+            MOZ_AUTOMATION_PACKAGE_TESTS: "1"
+            PERFHERDER_EXTRA_OPTIONS: lite
+    run:
+        actions: [get-secrets, build]
+        config: ["builds/releng_base_android_64_builds.py"]
+        custom-build-variant-cfg: x86_64-lite-debug
+    use-sccache: true
+    fetches:
+        toolchain:
+            - linux64-clang
+            - linux64-sccache
+            - android-gradle-dependencies-lite

 android-x86_64/debug-isolated-process:
    description: "Android 5.0 x86-64 Debug with Isolated Process"
@ -382,15 +694,16 @@ android-x86_64/debug-isolated-process:
        toolchain:
            - linux64-clang
            - linux64-sccache
+            - android-gradle-dependencies

 android-arm-gcp/debug:
-    description: "Android 4.0 Arm Debug - built on GCP"
+    description: "Android 5.0 Arm Debug - built on GCP"
    index:
        job-name: android-arm-gcp-debug
    attributes:
        enable-full-crashsymbols: true
    treeherder:
-        platform: android-4-0-armv7/debug
+        platform: android-5-0-armv7/debug
        symbol: B-gcp
        tier: 2
    worker-type: b-linux-gcp
@ -407,18 +720,19 @@ android-arm-gcp/debug:
        toolchain:
            - linux64-clang
            - linux64-sccache
+            - android-gradle-dependencies
    optimization:
        skip-unless-backstop: null


 android-x86-gcp/opt:
-    description: "Android 4.2 x86 Opt - built on GCP"
+    description: "Android 5.0 x86 Opt - built on GCP"
    index:
        job-name: android-x86-gcp-opt
    attributes:
        enable-full-crashsymbols: true
    treeherder:
-        platform: android-4-2-x86/opt
+        platform: android-5-0-x86/opt
        symbol: B-gcp
        tier: 2
    worker-type: b-linux-gcp
@ -435,17 +749,18 @@ android-x86-gcp/opt:
        toolchain:
            - linux64-clang
            - linux64-sccache
+            - android-gradle-dependencies
    optimization:
        skip-unless-backstop: null

 android-arm-gcp/opt:
-    description: "Android 4.0 Arm Opt - built on GCP"
+    description: "Android 5.0 Arm Opt - built on GCP"
    index:
        job-name: android-arm-gcp-opt
    attributes:
        enable-full-crashsymbols: true
    treeherder:
-        platform: android-4-0-armv7/opt
+        platform: android-5-0-armv7/opt
        symbol: B-gcp
        tier: 2
    worker-type: b-linux-gcp
@ -462,6 +777,7 @@ android-arm-gcp/opt:
        toolchain:
            - linux64-clang
            - linux64-sccache
+            - android-gradle-dependencies
    optimization:
        skip-unless-backstop: null

@ -489,6 +805,7 @@ android-aarch64-gcp/opt:
        toolchain:
            - linux64-clang
            - linux64-sccache
+            - android-gradle-dependencies
    optimization:
        skip-unless-backstop: null

@ -516,6 +833,7 @@ android-aarch64-gcp/debug:
        toolchain:
            - linux64-clang
            - linux64-sccache
+            - android-gradle-dependencies
    optimization:
        skip-unless-backstop: null

@ -543,6 +861,7 @@ android-x86_64-gcp/opt:
        toolchain:
            - linux64-clang
            - linux64-sccache
+            - android-gradle-dependencies
    optimization:
        skip-unless-backstop: null

@ -568,6 +887,7 @@ android-x86_64-gcp/debug:
    fetches:
        toolchain:
            - linux64-clang
+            - android-gradle-dependencies
    optimization:
        skip-unless-backstop: null

@ -591,5 +911,6 @@ android-x86_64-asan-fuzzing/opt:
        toolchain:
            - linux64-clang-android-cross
            - linux64-sccache
+            - android-gradle-dependencies
    optimization:
        skip-unless-expanded: null
--- a/taskcluster/ci/generate-profile/kind.yml
+++ b/taskcluster/ci/generate-profile/kind.yml
@ -86,14 +86,14 @@ jobs:
                - linux64-minidump-stackwalk

    android-x86-shippable/opt:
-        description: "Android 4.0 x86 Profile Generation"
+        description: "Android 5.0 x86 Profile Generation"
        shipping-phase: build
        shipping-product: fennec
        index:
            product: mobile
            job-name: android-x86-profile
        treeherder:
-            platform: android-4-0-x86/pgo
+            platform: android-5-0-x86/pgo
        worker-type: t-linux-xlarge-pgo
        worker:
            chain-of-trust: true
--- a/taskcluster/ci/instrumented-build/kind.yml
+++ b/taskcluster/ci/instrumented-build/kind.yml
@ -138,13 +138,13 @@ jobs:
                - wasi-sysroot

    android-x86-shippable/opt:
-        description: "Android 4.0 x86 PGO instrumented"
+        description: "Android 5.0 x86 PGO instrumented"
        index:
            product: mobile
            job-name: instrumented-android-x86
        shipping-product: fennec
        treeherder:
-            platform: android-4-0-x86/pgo
+            platform: android-5-0-x86/pgo
        worker-type: b-linux
        worker:
            docker-image: {in-tree: android-build}
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@ -419,17 +419,34 @@ android-em-7.0-x86_64/opt:
        - android-x86_64-tests
        - web-platform-tests-backlog

+android-em-7.0-x86_64-lite/opt:
+    build-platform: android-x86_64-lite/opt
+    test-sets:
+        - android-x86_64-tests
+        - web-platform-tests-backlog
+
 android-em-7.0-x86_64-shippable/opt:
    build-platform: android-x86_64-shippable/opt
    test-sets:
        - android-x86_64-tests
        - web-platform-tests-backlog

+android-em-7.0-x86_64-shippable-lite/opt:
+    build-platform: android-x86_64-shippable-lite/opt
+    test-sets:
+        - android-x86_64-tests
+        - web-platform-tests-backlog
+
 android-em-7.0-x86_64/debug:
    build-platform: android-x86_64/debug
    test-sets:
        - android-x86_64-tests

+android-em-7.0-x86_64-lite/debug:
+    build-platform: android-x86_64-lite/debug
+    test-sets:
+        - android-x86_64-tests
+
 android-em-7.0-x86_64/debug-isolated-process:
    build-platform: android-x86_64/debug-isolated-process
    test-sets:
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@ -33,9 +33,9 @@ job-defaults:
                    - remove_executables.py
    target:
        by-test-platform:
-            android-em-7.0-x86_64-shippable(-qr)?/opt: geckoview-androidTest.apk
-            android-em-7.0-x86_64(-qr)?/opt: geckoview-androidTest.apk
-            android-em-7.0-x86_64(-qr)?/debug(-isolated-process)?: geckoview-androidTest.apk
+            android-em-7.0-x86_64-shippable(-qr|-lite)?/opt: geckoview-androidTest.apk
+            android-em-7.0-x86_64(-qr|-lite)?/opt: geckoview-androidTest.apk
+            android-em-7.0-x86_64(-qr|-lite)?/debug(-isolated-process)?: geckoview-androidTest.apk
            default: null
    python-3: true

--- a/taskcluster/ci/toolchain/android.yml
+++ b/taskcluster/ci/toolchain/android.yml
@ -140,3 +140,30 @@ linux64-android-gradle-dependencies:
            # Aliases aren't allowed for toolchains depending on toolchains.
            - linux64-android-sdk-linux-repack
            - linux64-node
+
+linux64-android-gradle-dependencies-lite:
+    description: "Android Lite Gradle dependencies toolchain task"
+    treeherder:
+        symbol: TL(gradle-dependencies-lite)
+    worker:
+        env:
+            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-online"
+    run:
+        script: android-gradle-dependencies-lite.sh
+        sparse-profile: null
+        resources:
+            - 'taskcluster/scripts/misc/android-gradle-dependencies/**'
+            - '*.gradle'
+            - 'mobile/android/**/*.gradle'
+            - 'mobile/android/config/mozconfigs/android-arm-gradle-dependencies/**'
+            - 'mobile/android/config/mozconfigs/common*'
+            - 'mobile/android/gradle.configure'
+        toolchain-artifact: public/build/android-gradle-dependencies.tar.zst
+        toolchain-alias: android-gradle-dependencies-lite
+    fetches:
+        fetch:
+            - sonatype-nexus
+        toolchain:
+            # Aliases aren't allowed for toolchains depending on toolchains.
+            - linux64-android-sdk-linux-repack
+            - linux64-node
--- a/taskcluster/scripts/misc/android-gradle-dependencies-lite.sh
+++ b/taskcluster/scripts/misc/android-gradle-dependencies-lite.sh
@ -0,0 +1,17 @@
+#!/bin/bash -vex
+
+set -x -e
+
+echo "running as" $(id)
+
+set -v
+
+cd $GECKO_PATH
+
+. taskcluster/scripts/misc/android-gradle-dependencies/before.sh
+
+export MOZCONFIG=mobile/android/config/mozconfigs/android-arm-gradle-dependencies/nightly-lite
+./mach build
+./mach android gradle-dependencies
+
+. taskcluster/scripts/misc/android-gradle-dependencies/after.sh
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@ -1444,10 +1444,14 @@ def handle_tier(config, tasks):
                "macosx1015-64-shippable-qr/opt",
                "macosx1015-64-qr/debug",
                "android-em-7.0-x86_64-shippable/opt",
+                "android-em-7.0-x86_64-shippable-lite/opt",
                "android-em-7.0-x86_64/debug",
                "android-em-7.0-x86_64/debug-isolated-process",
+                "android-em-7.0-x86_64-lite/debug",
                "android-em-7.0-x86_64/opt",
+                "android-em-7.0-x86_64-lite/opt",
                "android-em-7.0-x86-shippable/opt",
+                "android-em-7.0-x86-shippable-lite/opt",
                "android-em-7.0-x86_64-shippable-qr/opt",
                "android-em-7.0-x86_64-qr/debug",
                "android-em-7.0-x86_64-qr/opt",
--- a/taskcluster/taskgraph/util/declarative_artifacts.py
+++ b/taskcluster/taskgraph/util/declarative_artifacts.py
@ -16,10 +16,15 @@ _ARTIFACT_ID_PER_PLATFORM = {
    "android-x86_64-opt": "geckoview-default-x86_64",
    "android-geckoview-fat-aar-opt": "geckoview-default",
    "android-aarch64-shippable": "geckoview{update_channel}-arm64-v8a",
+    "android-aarch64-shippable-lite": "geckoview{update_channel}-lite-arm64-v8a",
    "android-arm-shippable": "geckoview{update_channel}-armeabi-v7a",
+    "android-arm-shippable-lite": "geckoview{update_channel}-lite-armeabi-v7a",
    "android-x86-shippable": "geckoview{update_channel}-x86",
+    "android-x86-shippable-lite": "geckoview{update_channel}-lite-x86",
    "android-x86_64-shippable": "geckoview{update_channel}-x86_64",
+    "android-x86_64-shippable-lite": "geckoview{update_channel}-lite-x86_64",
    "android-geckoview-fat-aar-shippable": "geckoview{update_channel}",
+    "android-geckoview-fat-aar-shippable-lite": "geckoview{update_channel}-lite",
 }


--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_debug_lite.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_debug_lite.py
@ -0,0 +1,9 @@
+# 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/.
+
+config = {
+    "stage_platform": "android-aarch64-lite-debug",
+    "src_mozconfig": "mobile/android/config/mozconfigs/android-aarch64/debug-lite",
+    "debug_build": True,
+}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_lite.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_lite.py
@ -0,0 +1,8 @@
+# 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/.
+
+config = {
+    "stage_platform": "android-aarch64-lite",
+    "src_mozconfig": "mobile/android/config/mozconfigs/android-aarch64/nightly-lite",
+}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_arm_debug_lite.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_arm_debug_lite.py
@ -0,0 +1,9 @@
+# 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/.
+
+config = {
+    "stage_platform": "android-arm-lite-debug",
+    "src_mozconfig": "mobile/android/config/mozconfigs/android-arm/debug-lite",
+    "debug_build": True,
+}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_arm_lite.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_arm_lite.py
@ -0,0 +1,8 @@
+# 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/.
+
+config = {
+    "stage_platform": "android-arm-lite",
+    "src_mozconfig": "mobile/android/config/mozconfigs/android-arm/nightly-lite",
+}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_arm_partner_sample1_lite.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_arm_partner_sample1_lite.py
@ -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/.
+
+config = {
+    "stage_platform": "android-arm-partner-sample1-lite",
+    "src_mozconfig": None,  # use manifest to determine mozconfig src
+    "src_mozconfig_manifest": "partner/mozconfigs/mozconfig1.json",
+    "tooltool_manifest_src": "mobile/android/config/tooltool-manifests/android/releng.manifest",
+}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_arm_profile_generate_lite.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_arm_profile_generate_lite.py
@ -0,0 +1,8 @@
+# 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/.
+
+config = {
+    "stage_platform": "android-arm-lite",
+    "src_mozconfig": "mobile/android/config/mozconfigs/android-arm/profile-generate-lite",
+}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_debug_lite.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_debug_lite.py
@ -0,0 +1,9 @@
+# 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/.
+
+config = {
+    "stage_platform": "android-x86_64-lite-debug",
+    "src_mozconfig": "mobile/android/config/mozconfigs/android-x86_64/debug-lite",
+    "debug_build": True,
+}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_lite.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_lite.py
@ -0,0 +1,8 @@
+# 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/.
+
+config = {
+    "stage_platform": "android-x86_64-lite",
+    "src_mozconfig": "mobile/android/config/mozconfigs/android-x86_64/nightly-lite",
+}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_debug_lite.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_debug_lite.py
@ -0,0 +1,9 @@
+# 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/.
+
+config = {
+    "stage_platform": "android-x86-lite-debug",
+    "src_mozconfig": "mobile/android/config/mozconfigs/android-x86/debug-lite",
+    "debug_build": True,
+}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_lite.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_lite.py
@ -0,0 +1,8 @@
+# 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/.
+
+config = {
+    "stage_platform": "android-x86-lite",
+    "src_mozconfig": "mobile/android/config/mozconfigs/android-x86/nightly-lite",
+}
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@ -295,34 +295,42 @@ class BuildOptionParser(object):
        "arm-gradle-dependencies": path_base
        + "%s_arm_gradle_dependencies.py",  # NOQA: E501
        "arm": path_base + "%s_arm.py",
+        "arm-lite": path_base + "%s_arm_lite.py",
        "arm-beta": path_base + "%s_arm_beta.py",
        "arm-beta-debug": path_base + "%s_arm_beta_debug.py",
        "arm-debug": path_base + "%s_arm_debug.py",
+        "arm-lite-debug": path_base + "%s_arm_debug_lite.py",
        "arm-debug-ccov": path_base + "%s_arm_debug_ccov.py",
        "arm-debug-searchfox": path_base + "%s_arm_debug_searchfox.py",
        "arm-gradle": path_base + "%s_arm_gradle.py",
        "rusttests": path_base + "%s_rusttests.py",
        "rusttests-debug": path_base + "%s_rusttests_debug.py",
        "x86": path_base + "%s_x86.py",
+        "x86-lite": path_base + "%s_x86_lite.py",
        "x86-beta": path_base + "%s_x86_beta.py",
        "x86-beta-debug": path_base + "%s_x86_beta_debug.py",
        "x86-debug": path_base + "%s_x86_debug.py",
+        "x86-lite-debug": path_base + "%s_x86_debug_lite.py",
        "x86-fuzzing-debug": path_base + "%s_x86_fuzzing_debug.py",
        "x86-profile-generate": path_base + "%s_x86_profile_generate.py",
        "x86_64": path_base + "%s_x86_64.py",
+        "x86_64-lite": path_base + "%s_x86_64_lite.py",
        "x86_64-beta": path_base + "%s_x86_64_beta.py",
        "x86_64-beta-debug": path_base + "%s_x86_64_beta_debug.py",
        "x86_64-debug": path_base + "%s_x86_64_debug.py",
+        "x86_64-lite-debug": path_base + "%s_x86_64_debug_lite.py",
        "x86_64-debug-isolated-process": path_base
        + "%s_x86_64_debug_isolated_process.py",
        "x86_64-fuzzing-asan": path_base + "%s_x86_64_fuzzing_asan.py",
        "x86_64-profile-generate": path_base + "%s_x86_64_profile_generate.py",
        "arm-partner-sample1": path_base + "%s_arm_partner_sample1.py",
        "aarch64": path_base + "%s_aarch64.py",
+        "aarch64-lite": path_base + "%s_aarch64_lite.py",
        "aarch64-beta": path_base + "%s_aarch64_beta.py",
        "aarch64-beta-debug": path_base + "%s_aarch64_beta_debug.py",
        "aarch64-pgo": path_base + "%s_aarch64_pgo.py",
        "aarch64-debug": path_base + "%s_aarch64_debug.py",
+        "aarch64-lite-debug": path_base + "%s_aarch64_debug_lite.py",
        "android-geckoview-docs": path_base + "%s_geckoview_docs.py",
        "valgrind": path_base + "%s_valgrind.py",
    }