Fixes for 071-dexfile
Ensure dex2oat has the correct process group.
Don't unmap dex file in DexFile.open.
Diagnostic warning messages in DexFile.open in particular as the class
loader will swallow the IOExceptions without logging.
Fix location of test-ex.jar for test 068-classloader.
Change-Id: Ie54ebb98b687db1eb30091c86de9beb860c26c3d
diff --git a/test/068-classloader/src/FancyLoader.java b/test/068-classloader/src/FancyLoader.java
index 173b08f..28c17a8 100644
--- a/test/068-classloader/src/FancyLoader.java
+++ b/test/068-classloader/src/FancyLoader.java
@@ -35,10 +35,10 @@
*/
public class FancyLoader extends ClassLoader {
/* this is where the "alternate" .class files live */
- static final String CLASS_PATH = "classes-ex/";
+ static final String CLASS_PATH = "/data/art-test";
/* this is the "alternate" DEX/Jar file */
- static final String DEX_FILE = "test-ex.jar";
+ static final String DEX_FILE = "068-classloader-ex.jar";
/* on Dalvik, this is a DexFile; otherwise, it's null */
private Class mDexClass;
@@ -94,7 +94,7 @@
}
try {
- mDexFile = ctor.newInstance(DEX_FILE);
+ mDexFile = ctor.newInstance(CLASS_PATH + File.separator + DEX_FILE);
} catch (InstantiationException ie) {
throw new ClassNotFoundException("newInstance failed", ie);
} catch (IllegalAccessException iae) {