From 4172650d0a17a3dbb96c2b18f41daf19a5377a70 Mon Sep 17 00:00:00 2001
From: "Jonathan Almeida [:jonalmeida]" <jonalmeida942@gmail.com>
Date: Wed, 23 Sep 2015 22:28:59 -0400
Subject: [PATCH] Bug 1175555 - Build flag to exclude hyphenation dictionaries
 from Android builds. r=nalexander

---
 configure.in                             | 9 +++++++++
 intl/locales/Makefile.in                 | 2 ++
 mobile/android/base/AppConstants.java.in | 7 +++++++
 3 files changed, 18 insertions(+)

diff --git a/configure.in b/configure.in
index 47901cbf4a3..87b7cc3a246 100644
--- a/configure.in
+++ b/configure.in
@@ -3756,6 +3756,7 @@ MOZ_ANDROID_SEARCH_ACTIVITY=
 MOZ_ANDROID_DOWNLOADS_INTEGRATION=
 MOZ_ANDROID_MLS_STUMBLER=
 MOZ_ANDROID_SHARE_OVERLAY=
+MOZ_EXCLUDE_HYPHENATION_DICTIONARIES=
 MOZ_INSTALL_TRACKING=
 MOZ_SWITCHBOARD=
 ACCESSIBILITY=1
@@ -4861,6 +4862,13 @@ if test -n "$MOZ_ANDROID_TAB_QUEUE"; then
     AC_DEFINE(MOZ_ANDROID_TAB_QUEUE)
 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 = Include install tracking on Android
 dnl ========================================================
@@ -8592,6 +8600,7 @@ 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_EXCLUDE_HYPHENATION_DICTIONARIES)
 AC_SUBST(MOZ_INSTALL_TRACKING)
 AC_SUBST(MOZ_SWITCHBOARD)
 AC_SUBST(ENABLE_STRIP)
diff --git a/intl/locales/Makefile.in b/intl/locales/Makefile.in
index caa1947beb3..7d5908d583a 100644
--- a/intl/locales/Makefile.in
+++ b/intl/locales/Makefile.in
@@ -4,9 +4,11 @@
 
 include $(topsrcdir)/config/rules.mk
 
+ifndef MOZ_EXCLUDE_HYPHENATION_DICTIONARIES
 PATTERN_FILES = $(strip $(wildcard $(srcdir)/*/hyphenation/*.dic))
 
 ifneq (,$(PATTERN_FILES))
 libs::
 	$(INSTALL)  $(PATTERN_FILES) $(FINAL_TARGET)/hyphenation
 endif
+endif # MOZ_EXCLUDE_HYPHENATION_DICTIONARIES
diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in
index b5fadcfb448..08d291462ef 100644
--- a/mobile/android/base/AppConstants.java.in
+++ b/mobile/android/base/AppConstants.java.in
@@ -153,6 +153,13 @@ public class AppConstants {
     null;
 //#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 --
      * no xhdpi+ images, for example.