Bug 1257958 - Move MOZ_ANDROID_EXCLUDE_FONTS to Python configure. r=nalexander
authorChris Manchester <cmanchester@mozilla.com>
Fri, 22 Apr 2016 13:01:21 -0700
changeset 294593 083f95a42cc87c8da3d9ebe3090c8c90cf036406
parent 294592 6ef6252740a31dc8ad86e79a059a13cf4e703080
child 294594 ddcd38c4444fd5c0ba9295006a62e9a2186e0f07
push id18911
push usercbook@mozilla.com
push dateMon, 25 Apr 2016 09:57:50 +0000
treeherderfx-team@1c6385ae1fe7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1257958
milestone48.0a1
Bug 1257958 - Move MOZ_ANDROID_EXCLUDE_FONTS to Python configure. r=nalexander MozReview-Commit-ID: 1bzIu2MA9qu
mobile/android/base/moz.build
mobile/android/confvars.sh
mobile/android/installer/Makefile.in
mobile/android/moz.configure
old-configure.in
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -928,17 +928,17 @@ if CONFIG['MOZ_ANDROID_DISTRIBUTION_DIRE
         ]
 
 # We do not expose MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN here because that
 # would leak the value to build logs.  Instead we expose the token quietly where
 # appropriate in Makefile.in.
 for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZ_DEBUG',
             'MOZ_ANDROID_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER',
             'MOZ_ANDROID_DOWNLOADS_INTEGRATION', 'MOZ_INSTALL_TRACKING',
-            'MOZ_ANDROID_GCM'):
+            'MOZ_ANDROID_GCM', 'MOZ_ANDROID_EXCLUDE_FONTS'):
     if CONFIG[var]:
         DEFINES[var] = 1
 
 for var in ('MOZ_UPDATER', 'MOZ_PKG_SPECIAL', 'MOZ_ANDROID_GCM_SENDERID'):
     if CONFIG[var]:
         DEFINES[var] = CONFIG[var]
 
 for var in ('ANDROID_PACKAGE_NAME', 'ANDROID_CPU_ARCH',
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -102,10 +102,8 @@ MOZ_ADDON_SIGNING=1
 
 # Enable the Switchboard A/B framework code.
 # Note: The framework is always included in the app. This flag controls
 # usage of the framework.
 MOZ_SWITCHBOARD=1
 
 # Enable DLC background service and stop shipping fonts in the APK
 MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE=1
-MOZ_ANDROID_EXCLUDE_FONTS=1
-
--- a/mobile/android/installer/Makefile.in
+++ b/mobile/android/installer/Makefile.in
@@ -32,16 +32,20 @@ DEFINES += \
   -DMOZ_CHILD_PROCESS_NAME_PIE=$(MOZ_CHILD_PROCESS_NAME_PIE) \
   -DANDROID_CPU_ARCH=$(ANDROID_CPU_ARCH) \
   $(NULL)
 
 ifdef MOZ_DEBUG
 DEFINES += -DMOZ_DEBUG=1
 endif
 
+ifdef MOZ_ANDROID_EXCLUDE_FONTS
+DEFINES += -DMOZ_ANDROID_EXCLUDE_FONTS=1
+endif
+
 MOZ_PACKAGER_MINIFY=1
 
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
 
 # Note that JS_BINARY can be defined in packager.mk, so this test must come
 # after including that file. MOZ_PACKAGER_MINIFY_JS is used in packager.mk, but
 # since recipe evaluation is deferred, we can set it here after the inclusion.
 ifneq (,$(JS_BINARY))
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -1,14 +1,18 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
+env_flag('MOZ_ANDROID_EXCLUDE_FONTS',
+         help='Whether to exclude font files from the build',
+         default=True)
+
 @depends(target)
 def check_target(target):
     if target.os != 'Android':
         log.error('You must specify --target=arm-linux-androideabi (or some '
                   'other valid Android target) when building mobile/android.')
         die('See https://developer.mozilla.org/docs/Mozilla/Developer_guide/'
             'Build_Instructions/Simple_Firefox_for_Android_build '
             'for more information about the necessary options.')
--- a/old-configure.in
+++ b/old-configure.in
@@ -3598,23 +3598,16 @@ 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.
@@ -6855,17 +6848,16 @@ 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)