summaryrefslogtreecommitdiff
path: root/test/068-classloader/src
diff options
context:
space:
mode:
Diffstat (limited to 'test/068-classloader/src')
-rw-r--r--test/068-classloader/src/FancyLoader.java2
-rw-r--r--test/068-classloader/src/Main.java24
2 files changed, 1 insertions, 25 deletions
diff --git a/test/068-classloader/src/FancyLoader.java b/test/068-classloader/src/FancyLoader.java
index b8eac7b52f..6a153cc9e2 100644
--- a/test/068-classloader/src/FancyLoader.java
+++ b/test/068-classloader/src/FancyLoader.java
@@ -38,7 +38,7 @@ public class FancyLoader extends ClassLoader {
static final String CLASS_PATH = "classes-ex/";
/* this is the "alternate" DEX/Jar file */
- public static final String DEX_FILE = System.getenv("DEX_LOCATION") + "/068-classloader-ex.jar";
+ static final String DEX_FILE = System.getenv("DEX_LOCATION") + "/068-classloader-ex.jar";
/* on Dalvik, this is a DexFile; otherwise, it's null */
private Class mDexClass;
diff --git a/test/068-classloader/src/Main.java b/test/068-classloader/src/Main.java
index e3bf82c8c3..361e2938e3 100644
--- a/test/068-classloader/src/Main.java
+++ b/test/068-classloader/src/Main.java
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
/**
* Class loader test.
*/
@@ -64,28 +62,6 @@ public class Main {
testSeparation();
testClassForName();
-
- // Attempt to load without a class table, regression test for b/25866849.
- testLoadNativeLibrary(args[0]);
- }
-
- static void testLoadNativeLibrary(String libName) throws Exception {
- Class pathClassLoader = Class.forName("dalvik.system.PathClassLoader");
- if (pathClassLoader == null) {
- throw new AssertionError("Couldn't find path class loader class");
- }
- Constructor constructor =
- pathClassLoader.getDeclaredConstructor(String.class, ClassLoader.class);
- ClassLoader loader = (ClassLoader) constructor.newInstance(
- FancyLoader.DEX_FILE, ClassLoader.getSystemClassLoader());
- Runtime runtime = Runtime.getRuntime();
- Method method = runtime.getClass().getDeclaredMethod("loadLibrary", String.class,
- ClassLoader.class);
- if (method == null) {
- throw new RuntimeException("loadLibrary not found");
- }
- method.setAccessible(true);
- method.invoke(runtime, libName, loader);
}
static void testSeparation() {