Bug 1249354 - configure.in: Remove --disable-android-include-fonts configuration option. r=nalexander
authorSebastian Kaspari <s.kaspari@gmail.com>
Fri, 19 Feb 2016 10:40:01 +0000
changeset 285096 8cc2ebfd125a2550a902b5b014e9c49106e01cf2
parent 285095 25697d5038158fadb93ec3ed76f3c2e84fd4f60f
child 285097 99a0241ace6b08565e1b8b816e48bb59d39a91e2
push id72242
push users.kaspari@gmail.com
push dateTue, 23 Feb 2016 14:20:50 +0000
treeherdermozilla-inbound@8cc2ebfd125a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1249354
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1249354 - configure.in: Remove --disable-android-include-fonts configuration option. r=nalexander This resembles what we are doing with MOZ_EXCLUDE_HYPHENATION_DICTIONARIES: We just have a flag without any --disable-* configuration option. MozReview-Commit-ID: ATxb5XAzp9k
configure.in
--- a/configure.in
+++ b/configure.in
@@ -3846,28 +3846,16 @@ AC_SUBST(MOZ_INSTALL_TRACKING_ADJUST_SDK
 # Allow specifying a GCM sender ID key file that contains the sender ID used for
 # GCM requests.  Note that GCM sender IDs are not sensitive: see, for example,
 # http://stackoverflow.com/a/18216063.
 MOZ_ARG_WITH_STRING(gcm-senderid-keyfile,
 [  --with-gcm-senderid-keyfile=file GCM sender ID for GCM requests],
   MOZ_ANDROID_GCM_SENDERID=`cat $withval`)
 AC_SUBST(MOZ_ANDROID_GCM_SENDERID)
 
-# Whether to include optional-but-large font files in the final APK.
-# We want this in mobile/android/confvars.sh, so it goes early.
-MOZ_ARG_DISABLE_BOOL(android-include-fonts,
-[  --disable-android-include-fonts
-                          Disable the inclusion of fonts into the final APK],
-    MOZ_ANDROID_EXCLUDE_FONTS=1)
-
-if test -n "$MOZ_ANDROID_EXCLUDE_FONTS"; then
-    AC_DEFINE(MOZ_ANDROID_EXCLUDE_FONTS)
-fi
-AC_SUBST(MOZ_ANDROID_EXCLUDE_FONTS)
-
 # Whether this APK is destined for resource constrained devices.
 # We want this in mobile/android/confvars.sh, so it goes early.
 MOZ_ARG_ENABLE_BOOL(android-resource-constrained,
 [  --enable-android-resource-constrained
                           Exclude hi-res images and similar from the final APK],
     MOZ_ANDROID_RESOURCE_CONSTRAINED=1)
 
 if test -n "$MOZ_ANDROID_RESOURCE_CONSTRAINED"; then
@@ -4771,16 +4759,23 @@ fi
 dnl ========================================================
 dnl = Include Mozilla Location Service Stumbler on Android
 dnl ========================================================
 if test -n "$MOZ_ANDROID_MLS_STUMBLER"; then
     AC_DEFINE(MOZ_ANDROID_MLS_STUMBLER)
 fi
 
 dnl =========================================================
+dnl = Whether to exclude font files in the build
+dnl =========================================================
+if test -n "$MOZ_ANDROID_EXCLUDE_FONTS"; then
+    AC_DEFINE(MOZ_ANDROID_EXCLUDE_FONTS)
+fi
+
+dnl =========================================================
 dnl = Whether to exclude hyphenations files in the build
 dnl =========================================================
 if test -n "$MOZ_EXCLUDE_HYPHENATION_DICTIONARIES"; then
     AC_DEFINE(MOZ_EXCLUDE_HYPHENATION_DICTIONARIES)
 fi
 
 dnl =========================================================
 dnl = Background service for downloading additional content at runtime.
@@ -8452,16 +8447,17 @@ AC_SUBST(MOZ_ANDROID_GECKOLIBS_AAR)
 AC_SUBST(MOZ_ANDROID_SEARCH_ACTIVITY)
 AC_SUBST(MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER)
 AC_SUBST(MOZ_ANDROID_MLS_STUMBLER)
 AC_SUBST(MOZ_ANDROID_DOWNLOADS_INTEGRATION)
 AC_SUBST(MOZ_ANDROID_APPLICATION_CLASS)
 AC_SUBST(MOZ_ANDROID_BROWSER_INTENT_CLASS)
 AC_SUBST(MOZ_ANDROID_SEARCH_INTENT_CLASS)
 AC_SUBST(MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE)
+AC_SUBST(MOZ_ANDROID_EXCLUDE_FONTS)
 AC_SUBST(MOZ_EXCLUDE_HYPHENATION_DICTIONARIES)
 AC_SUBST(MOZ_INSTALL_TRACKING)
 AC_SUBST(MOZ_SWITCHBOARD)
 AC_SUBST(ENABLE_STRIP)
 AC_SUBST(PKG_SKIP_STRIP)
 AC_SUBST(STRIP_FLAGS)
 AC_SUBST(USE_ELF_HACK)
 AC_SUBST(INCREMENTAL_LINKER)