From 75245fcfe3555e4dd06939b9bae366fd3e43b658 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Sun, 1 Apr 2012 19:55:38 -0700 Subject: Include library path information in BaseDexClassLoader for better error reporting in Runtime.loadLibrary (cherry-pick of b6a576f43f1c23bb92493590a04bf9c72f092438.) Change-Id: I6f34862327cf99d8c6f9a7e9aa3aeab47985969b --- dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'dalvik') diff --git a/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java b/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java index 5782fd9..62ec5e3 100644 --- a/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java +++ b/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java @@ -28,6 +28,9 @@ public class BaseDexClassLoader extends ClassLoader { /** originally specified path (just used for {@code toString()}) */ private final String originalPath; + /** originally specified library path (just used for {@code toString()}) */ + private final String originalLibraryPath; + /** structured lists of path elements */ private final DexPathList pathList; @@ -49,6 +52,7 @@ public class BaseDexClassLoader extends ClassLoader { super(parent); this.originalPath = dexPath; + this.originalLibraryPath = libraryPath; this.pathList = new DexPathList(this, dexPath, libraryPath, optimizedDirectory); } @@ -123,6 +127,7 @@ public class BaseDexClassLoader extends ClassLoader { @Override public String toString() { - return getClass().getName() + "[" + originalPath + "]"; + return getClass().getName() + + "[dexPath=" + originalPath + ",libraryPath=" + originalLibraryPath + "]"; } } -- cgit v1.1