diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -167,6 +167,16 @@ recurse_android-fat-aar-artifact:
     --distdir $(abspath $(DIST)/fat-aar))
 endif

+ifeq ($(MOZ_BUILD_APP),mobile/android)
+
+# Invoking `mach package` causes issues like: `make[N]: *** write jobserver: Bad file descriptor.  Stop.`.
+recurse_android-mach-package:
+	$(MAKE) package
+
+recurse_android-archive-geckoview:
+	GRADLE_INVOKED_WITHIN_MACH_BUILD=1 $(topsrcdir)/mach --log-no-times android archive-geckoview
+endif
+
 ifdef MOZ_WIDGET_TOOLKIT
 ifdef ENABLE_TESTS
 # Additional makefile targets to call automated test suites
diff --git a/config/baseconfig.mk b/config/baseconfig.mk
--- a/config/baseconfig.mk
+++ b/config/baseconfig.mk
@@ -43,7 +43,7 @@ ifndef INCLUDED_AUTOCONF_MK
 default::
 else
 # All possible tiers
-ALL_TIERS := artifact win32-artifact android-fat-aar-artifact pre-export export rust compile misc libs tools check
+ALL_TIERS := artifact win32-artifact android-fat-aar-artifact pre-export export rust compile misc libs android-mach-package android-archive-geckoview tools check

 # All tiers that may be used manually via `mach build $tier`
 RUNNABLE_TIERS := $(ALL_TIERS)
@@ -56,6 +56,10 @@ endif
 ifndef MOZ_ANDROID_FAT_AAR_ARCHITECTURES
 RUNNABLE_TIERS := $(filter-out android-fat-aar-artifact,$(RUNNABLE_TIERS))
 endif
+ifneq ($(MOZ_BUILD_APP),mobile/android)
+RUNNABLE_TIERS := $(filter-out android-mach-package,$(RUNNABLE_TIERS))
+RUNNABLE_TIERS := $(filter-out android-archive-geckoview,$(RUNNABLE_TIERS))
+endif

 # All tiers that run automatically on `mach build`
 TIERS := $(filter-out check,$(RUNNABLE_TIERS))
diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -126,6 +126,15 @@ imply_option('MOZ_SERVICES_HEALTHREPORT'
 imply_option('MOZ_ANDROID_HISTORY', True)
 imply_option('--enable-small-chunk-size', True)

+option('--without-fennec',
+       help='Build only GeckoView, do not build and package Fennec (Firefox for Android)')
+
+@depends('--with-fennec')
+def with_fennec(value):
+    return bool(value)
+
+set_config('MOZ_ANDROID_WITH_FENNEC', depends_if(with_fennec)(lambda _: True))
+
 @depends(target)
 def check_target(target):
     if target.os != 'Android':
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -14,7 +14,9 @@ libs:: make-package
 endif

 ifdef MOZ_AUTOMATION
+# This allows `RUN_{FIND_DUPES,TEST_ARCHIVE}=1 ./mach package` to test locally.
 RUN_FIND_DUPES ?= $(MOZ_AUTOMATION)
+RUN_TEST_ARCHIVE ?= $(MOZ_AUTOMATION)
 endif

 export USE_ELF_HACK ELF_HACK_FLAGS
@@ -38,10 +40,12 @@ ifdef RUN_FIND_DUPES
 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py $(DEFINES) $(ACDEFINES) $(MOZ_PKG_DUPEFLAGS) $(DIST)/$(MOZ_PKG_DIR)
 endif # RUN_FIND_DUPES
 ifndef MOZ_IS_COMM_TOPDIR
+ifdef RUN_TEST_ARCHIVE
 	# Package mozharness
 	$(call py_action,test_archive, \
 		mozharness \
 		$(ABS_DIST)/$(PKG_PATH)$(MOZHARNESS_PACKAGE))
+endif # RUN_TEST_ARCHIVE
 endif # MOZ_IS_COMM_TOPDIR
 ifdef MOZ_PACKAGE_JSSHELL
 	# Package JavaScript Shell
diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -225,7 +225,12 @@ endif #Create an RPM file


 ifeq ($(MOZ_PKG_FORMAT),APK)
+ifdef MOZ_ANDROID_WITH_FENNEC
 include $(MOZILLA_DIR)/toolkit/mozapps/installer/upload-files-$(MOZ_PKG_FORMAT).mk
+else
+INNER_MAKE_PACKAGE = true
+INNER_UNMAKE_PACKAGE = true
+endif # MOZ_ANDROID_WITH_FENNEC
 endif

 ifeq ($(MOZ_PKG_FORMAT),DMG)