Bug 253317 - Provide hyphenation dictionary for justified text (android packaging) [r=blassey]

embedding/android/GeckoApp.java

@@ -465,6 +465,16 @@ abstract public class GeckoApp
             unpackFile(zip, buf, entry, entry.getName());
           }
         }
+
+        // copy any hyphenation dictionaries file into a hyphenation/ directory
+        Enumeration<? extends ZipEntry> hyphenEntries = zip.entries();
+        while (hyphenEntries.hasMoreElements()) {
+          ZipEntry entry = hyphenEntries.nextElement();
+          if (entry.getName().startsWith("hyphenation/")) {
+            Log.i("GeckoAppJava", "installing hyphenation : " + entry.getName());
+            unpackFile(zip, buf, entry, entry.getName());
+          }
+        }
     }
 
     void removeFiles() throws IOException {

mobile/installer/package-manifest.in

@@ -32,6 +32,7 @@
 @BINPATH@/updater.ini
 #endif
 @BINPATH@/dictionaries/*
+@BINPATH@/hyphenation/*
 #ifdef XP_WIN32
 @BINPATH@/uninstall/helper.exe
 #endif

mobile/locales/Makefile.in

@@ -103,6 +103,7 @@ clobber-zip:
 	  $(STAGEDIST)/chrome/$(AB_CD).manifest \
 	  $(STAGEDIST)/defaults/preferences/mobile-l10n.js
 	$(RM) -r $(STAGEDIST)/dictionaries \
+	  $(STAGEDIST)/hyphenation \
 	  $(STAGEDIST)/defaults/profile \
 	  $(STAGEDIST)/chrome/$(AB_CD)
 
@@ -110,6 +111,7 @@ libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
 	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
+	@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 	@$(MAKE) -B bookmarks.json AB_CD=$*
 	@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/preferences BOTH_MANIFESTS=1

toolkit/mozapps/installer/packager.mk

@@ -233,6 +233,7 @@ DIST_FILES = \
   components \
   defaults \
   modules \
+  hyphenation \
   res \
   lib \
   lib.id \