Bug 1667896 - Remove MOZ_ANDROID_DISTRIBUTION_DIRECTORY r=nalexander

This config value is evidently a Fennec thing that isn't used anywhere any more. Differential Revision: https://phabricator.services.mozilla.com/D91647
dothq · Sep 29, 2020 · 2bb808e · 2bb808e
1 parent d9aa989
commit 2bb808e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 38 deletions.
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
@@ -177,7 +177,6 @@ def old_configure_options(*options):
     '--includedir',
     '--libdir',
     '--prefix',
-    '--with-android-distribution-directory',
     '--with-android-max-sdk',
     '--with-android-min-sdk',
     '--with-branding',

diff --git a/mobile/android/config/mozconfigs/public-partner/distribution_sample/mozconfig1 b/mobile/android/config/mozconfigs/public-partner/distribution_sample/mozconfig1
diff --git a/old-configure.in b/old-configure.in
@@ -1502,22 +1502,6 @@ case "$target_os" in
         ;;
 esac
 
-# Optional Firefox for Android partner distribution directory.
-MOZ_ARG_WITH_STRING(android-distribution-directory,
-[  --with-android-distribution-directory=dir
-                          Optional Firefox for Android partner distribution directory.],
-  MOZ_ANDROID_DISTRIBUTION_DIRECTORY=$withval)
-
-if test -n "$MOZ_ANDROID_DISTRIBUTION_DIRECTORY"; then
-  # A distribution directory must have an assets/distribution directory.
-  # See https://wiki.mozilla.org/Mobile/Distribution_Files.
-  if test ! -d "$MOZ_ANDROID_DISTRIBUTION_DIRECTORY/assets/distribution" ; then
-    AC_MSG_ERROR([--with-android-distribution-directory does not contain assets/distribution;
-                  (looked for ${MOZ_ANDROID_DISTRIBUTION_DIRECTORY}/assets/distribution).])
-  fi
-fi
-AC_SUBST(MOZ_ANDROID_DISTRIBUTION_DIRECTORY)
-
 dnl ========================================================
 dnl = Trademarked Branding
 dnl ========================================================