From 2c7e13b120926d3c3c18d649cd9849ea31b81477 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Fri, 11 May 2018 19:40:17 +0000 Subject: Revert "Do not load app image for class collisions" This reverts commit d8860b42e47d48fcc47db9d0daf5a1b9432180a1. Bug: 77342775 Bug: 79200502 Bug: 79575750 Reason for revert: Some regressions in boot time. Test: test-art-host Change-Id: Id5e5844b5156d048a54011708378c7cdb0650f68 --- test/172-app-image-twice/src/Main.java | 48 ---------------------------------- 1 file changed, 48 deletions(-) delete mode 100644 test/172-app-image-twice/src/Main.java (limited to 'test/172-app-image-twice/src/Main.java') diff --git a/test/172-app-image-twice/src/Main.java b/test/172-app-image-twice/src/Main.java deleted file mode 100644 index a1c151a6bc..0000000000 --- a/test/172-app-image-twice/src/Main.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.lang.reflect.Method; - -public class Main { - private static String TEST_NAME = "172-app-image-twice"; - - public static void main(String args[]) throws Exception { - System.loadLibrary(args[0]); - - Class tc1 = Class.forName("TestClass"); - - String dexPath = System.getenv("DEX_LOCATION") + "/" + TEST_NAME + ".jar"; - Class bdcl = Class.forName("dalvik.system.BaseDexClassLoader"); - Method addDexPathMethod = bdcl.getDeclaredMethod("addDexPath", String.class); - addDexPathMethod.invoke(Main.class.getClassLoader(), dexPath); - - Class tc2 = Class.forName("TestClass"); - - // Add extra logging to simulate libcore logging, this logging should not be compared - // against. - System.out.println("Extra logging"); - - if (tc1 != tc2) { - System.out.println("Class mismatch!"); - debugPrintClass(tc1); - debugPrintClass(tc2); - } else { - System.out.println("passed"); - } - } - - public static native void debugPrintClass(Class cls); -} -- cgit v1.2.3-59-g8ed1b