summaryrefslogtreecommitdiffstats
path: root/dalvik/src/main
diff options
context:
space:
mode:
authorDan Bornstein <danfuzz@android.com>2011-02-09 13:12:45 -0800
committerDan Bornstein <danfuzz@android.com>2011-02-09 13:12:45 -0800
commit7190be77a29ad8f35b044ec591cb2b449f3ea8a1 (patch)
tree7f5a2e57b83d9e97d350af53442088f7ea99d368 /dalvik/src/main
parenta7ee8ea69e1cdd0fa64c98e532b48b3c118156ea (diff)
downloadlibcore-7190be77a29ad8f35b044ec591cb2b449f3ea8a1.zip
libcore-7190be77a29ad8f35b044ec591cb2b449f3ea8a1.tar.gz
libcore-7190be77a29ad8f35b044ec591cb2b449f3ea8a1.tar.bz2
Restore the code for optimized file specification.
This bit got removed due to a copy-paste mishap. Bug: 3439372 Change-Id: If4653ec77bdc9b629ed4f5ba953be3eef6315b97
Diffstat (limited to 'dalvik/src/main')
-rw-r--r--dalvik/src/main/java/dalvik/system/DexClassLoader.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/dalvik/src/main/java/dalvik/system/DexClassLoader.java b/dalvik/src/main/java/dalvik/system/DexClassLoader.java
index a8d40b1..fea65dd 100644
--- a/dalvik/src/main/java/dalvik/system/DexClassLoader.java
+++ b/dalvik/src/main/java/dalvik/system/DexClassLoader.java
@@ -121,9 +121,10 @@ public class DexClassLoader extends ClassLoader {
* the dex file from it.
*/
try {
- mDexs[i] = new DexFile(pathFile);
- }
- catch (IOException ioex) {
+ String outputName =
+ generateOutputName(dexPathList[i], mDexOutputPath);
+ mDexs[i] = DexFile.loadDex(dexPathList[i], outputName, 0);
+ } catch (IOException ioex) {
// It might be a resource-only zip.
//System.out.println("Failed to construct DexFile '"
// + pathFile + "': " + ioex);