Move language pak files to assets.

base/android/java/src/org/chromium/base/ResourceExtractor.java

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.base;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ skipping 18 matching lines @@
  * the file system accessible from the native code.
  */
 public class ResourceExtractor {
 
     private static final String TAG = "cr.base";
     private static final String ICU_DATA_FILENAME = "icudtl.dat";
     private static final String V8_NATIVES_DATA_FILENAME = "natives_blob.bin";
     private static final String V8_SNAPSHOT_DATA_FILENAME = "snapshot_blob.bin";
     private static final String APP_VERSION_PREF = "org.chromium.base.ResourceExtractor.Version";
 
-    private static ResourceEntry[] sResourcesToExtract = new ResourceEntry[0];
-
-    /**
-     * Holds information about a res/raw file (e.g. locale .pak files).
-     */
-    public static final class ResourceEntry {
-        public final int resourceId;
-        public final String pathWithinApk;
-        public final String extractedFileName;
-
-        public ResourceEntry(int resourceId, String pathWithinApk, String extractedFileName) {
-            this.resourceId = resourceId;
-            this.pathWithinApk = pathWithinApk;
-            this.extractedFileName = extractedFileName;
-        }
-    }
+    private static ArrayList<String> sResourcesToExtract = new ArrayList<String>();
 
     private class ExtractTask extends AsyncTask<Void, Void, Void> {
         private static final int BUFFER_SIZE = 16 * 1024;
 
         private final List<Runnable> mCompletionCallbacks = new ArrayList<Runnable>();
 
         private void extractResourceHelper(InputStream is, File outFile, byte[] buffer)
                 throws IOException {
             OutputStream os = null;
             try {
@@ skipping 35 matching lines @@
                 deleteFiles();
                 // Use the version only to see if files should be deleted, not to skip extraction.
                 // We've seen files be corrupted, so always attempt extraction.
                 // http://crbug.com/606413
                 sharedPrefs.edit().putLong(APP_VERSION_PREF, curAppVersion).apply();
             }
 
             TraceEvent.begin("WalkAssets");
             byte[] buffer = new byte[BUFFER_SIZE];
             try {
-                for (ResourceEntry entry : sResourcesToExtract) {
-                    File output = new File(outputDir, entry.extractedFileName);
+                for (String resource : sResourcesToExtract) {
+                    File output = new File(outputDir, resource);
                     // TODO(agrieve): It would be better to check that .length == expectedLength.
                     //     http://crbug.com/606413
                     if (output.length() != 0) {
                         continue;
                     }
                     TraceEvent.begin("ExtractResource");
-                    InputStream inputStream = mContext.getResources().openRawResource(
-                            entry.resourceId);
+                    InputStream inputStream = mContext.getAssets().open(resource);
                     try {
                         extractResourceHelper(inputStream, output, buffer);
                     } finally {
                         TraceEvent.end("ExtractResource");
                     }
                 }
             } catch (IOException e) {
                 // TODO(benm): See crbug/152413.
                 // Try to recover here, can we try again after deleting files instead of
                 // returning null? It might be useful to gather UMA here too to track if
@@ skipping 57 matching lines @@
             sInstance = new ResourceExtractor(context);
         }
         return sInstance;
     }
 
     /**
      * Specifies the files that should be extracted from the APK.
      * and moved to {@link #getOutputDir()}.
      */
     @SuppressFBWarnings("EI_EXPOSE_STATIC_REP2")
-    public static void setResourcesToExtract(ResourceEntry[] entries) {
+    public static void setResourcesToExtract(ArrayList<String> resources) {
         assert (sInstance == null || sInstance.mExtractTask == null)
                 : "Must be called before startExtractingResources is called";
-        sResourcesToExtract = entries;
+        sResourcesToExtract = resources;
     }
 
     private ResourceExtractor(Context context) {
         mContext = context.getApplicationContext();
     }
 
     /**
      * Synchronously wait for the resource extraction to be completed.
      * <p>
      * This method is bad and you should feel bad for using it.
@@ skipping 111 matching lines @@
                     }
                 }
             }
         }
     }
 
     /**
      * Pak extraction not necessarily required by the embedder.
      */
     private static boolean shouldSkipPakExtraction() {
-        return sResourcesToExtract.length == 0;
+        return sResourcesToExtract.size() == 0;
     }
 }