bug 688779 - restore en-US hyphenation to the Android product. r=dougt
authorJonathan Kew <jfkthame@gmail.com>
Thu, 29 Sep 2011 10:37:56 +0100
changeset 77850 1d6129ccfa2bc8f9d4e2777be28d3365eeb481e0
parent 77799 e7854b4d29ba905ae3994f821b160c989bac4260
child 77851 3430e302d5bd75155f7d0c3742ea6cbb785f26ef
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
reviewersdougt
bugs688779
milestone10.0a1
bug 688779 - restore en-US hyphenation to the Android product. r=dougt
embedding/android/GeckoApp.java
toolkit/mozapps/installer/packager.mk
--- a/embedding/android/GeckoApp.java
+++ b/embedding/android/GeckoApp.java
@@ -618,16 +618,26 @@ abstract public class GeckoApp
         Enumeration<? extends ZipEntry> zipEntries = zip.entries();
         while (zipEntries.hasMoreElements()) {
             ZipEntry entry = zipEntries.nextElement();
             if (entry.getName().startsWith("extensions/") && entry.getName().endsWith(".xpi")) {
                 Log.i("GeckoAppJava", "installing extension : " + entry.getName());
                 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 {
         BufferedReader reader = new BufferedReader(
             new FileReader(new File(sGREDir, "removed-files")));
         try {
             for (String removedFileName = reader.readLine(); 
                  removedFileName != null; removedFileName = reader.readLine()) {
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -262,16 +262,17 @@ JARSIGNER ?= echo
 
 DIST_FILES = \
   resources.arsc \
   AndroidManifest.xml \
   chrome \
   components \
   defaults \
   modules \
+  hyphenation/hyph_en_US.dic \
   res \
   lib \
   lib.id \
   libmozalloc.so \
   libnspr4.so \
   libplc4.so \
   libplds4.so \
   libmozsqlite3.so \