| Index: base/android/java/src/org/chromium/base/ResourceExtractor.java
|
| diff --git a/base/android/java/src/org/chromium/base/ResourceExtractor.java b/base/android/java/src/org/chromium/base/ResourceExtractor.java
|
| index 26db654f5a781154e68de96973942f9edd6ea9ab..602d23a84ec5627ad3ce4ae884b61db7cd327d3b 100644
|
| --- a/base/android/java/src/org/chromium/base/ResourceExtractor.java
|
| +++ b/base/android/java/src/org/chromium/base/ResourceExtractor.java
|
| @@ -36,22 +36,7 @@ public class ResourceExtractor {
|
| 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 String[] sResourcesToExtract = new String[0];
|
|
|
| private class ExtractTask extends AsyncTask<Void, Void, Void> {
|
| private static final int BUFFER_SIZE = 16 * 1024;
|
| @@ -107,16 +92,15 @@ public class ResourceExtractor {
|
| 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 {
|
| @@ -194,10 +178,10 @@ public class ResourceExtractor {
|
| * and moved to {@link #getOutputDir()}.
|
| */
|
| @SuppressFBWarnings("EI_EXPOSE_STATIC_REP2")
|
| - public static void setResourcesToExtract(ResourceEntry[] entries) {
|
| + public static void setResourcesToExtract(String[] resources) {
|
| assert (sInstance == null || sInstance.mExtractTask == null)
|
| : "Must be called before startExtractingResources is called";
|
| - sResourcesToExtract = entries;
|
| + sResourcesToExtract = resources;
|
| }
|
|
|
| private ResourceExtractor(Context context) {
|
|
|