Bug 1175555 - Build flag to exclude hyphenation dictionaries from Android builds. r=nalexander

This commit is contained in:
Jonathan Almeida [:jonalmeida] 2015-09-23 22:28:59 -04:00
parent fef427f10c
commit 4172650d0a
3 changed files with 18 additions and 0 deletions

View File

@ -3756,6 +3756,7 @@ MOZ_ANDROID_SEARCH_ACTIVITY=
MOZ_ANDROID_DOWNLOADS_INTEGRATION= MOZ_ANDROID_DOWNLOADS_INTEGRATION=
MOZ_ANDROID_MLS_STUMBLER= MOZ_ANDROID_MLS_STUMBLER=
MOZ_ANDROID_SHARE_OVERLAY= MOZ_ANDROID_SHARE_OVERLAY=
MOZ_EXCLUDE_HYPHENATION_DICTIONARIES=
MOZ_INSTALL_TRACKING= MOZ_INSTALL_TRACKING=
MOZ_SWITCHBOARD= MOZ_SWITCHBOARD=
ACCESSIBILITY=1 ACCESSIBILITY=1
@ -4861,6 +4862,13 @@ if test -n "$MOZ_ANDROID_TAB_QUEUE"; then
AC_DEFINE(MOZ_ANDROID_TAB_QUEUE) AC_DEFINE(MOZ_ANDROID_TAB_QUEUE)
fi 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 ========================================================
dnl = Include install tracking on Android dnl = Include install tracking on Android
dnl ======================================================== dnl ========================================================
@ -8592,6 +8600,7 @@ AC_SUBST(MOZ_ANDROID_DOWNLOADS_INTEGRATION)
AC_SUBST(MOZ_ANDROID_APPLICATION_CLASS) AC_SUBST(MOZ_ANDROID_APPLICATION_CLASS)
AC_SUBST(MOZ_ANDROID_BROWSER_INTENT_CLASS) AC_SUBST(MOZ_ANDROID_BROWSER_INTENT_CLASS)
AC_SUBST(MOZ_ANDROID_SEARCH_INTENT_CLASS) AC_SUBST(MOZ_ANDROID_SEARCH_INTENT_CLASS)
AC_SUBST(MOZ_EXCLUDE_HYPHENATION_DICTIONARIES)
AC_SUBST(MOZ_INSTALL_TRACKING) AC_SUBST(MOZ_INSTALL_TRACKING)
AC_SUBST(MOZ_SWITCHBOARD) AC_SUBST(MOZ_SWITCHBOARD)
AC_SUBST(ENABLE_STRIP) AC_SUBST(ENABLE_STRIP)

View File

@ -4,9 +4,11 @@
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
ifndef MOZ_EXCLUDE_HYPHENATION_DICTIONARIES
PATTERN_FILES = $(strip $(wildcard $(srcdir)/*/hyphenation/*.dic)) PATTERN_FILES = $(strip $(wildcard $(srcdir)/*/hyphenation/*.dic))
ifneq (,$(PATTERN_FILES)) ifneq (,$(PATTERN_FILES))
libs:: libs::
$(INSTALL) $(PATTERN_FILES) $(FINAL_TARGET)/hyphenation $(INSTALL) $(PATTERN_FILES) $(FINAL_TARGET)/hyphenation
endif endif
endif # MOZ_EXCLUDE_HYPHENATION_DICTIONARIES

View File

@ -153,6 +153,13 @@ public class AppConstants {
null; null;
//#endif //#endif
public static final boolean MOZ_EXCLUDE_HYPHENATION_DICTIONARIES =
//#ifdef MOZ_EXCLUDE_HYPHENATION_DICTIONARIES
true;
//#else
false;
//#endif
/** /**
* Whether this APK was built with constrained resources -- * Whether this APK was built with constrained resources --
* no xhdpi+ images, for example. * no xhdpi+ images, for example.