From c1ff0ff1e3f64a991119b3f86db3dc9e76f3a4e4 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Wed, 11 Mar 2020 17:37:42 +0000 Subject: Revert^5 "[art] Enable compilation of secondary dexes by default i..." This reverts commit 085f3805cdfde5fdb130e31a2cf83071598ef082. Reason for revert: Failing for art-interpreter-no-image config Bug: 149098478 Change-Id: Ic69345dd5d3ffa4450dbc6bb99d23acd7455a206 --- .../src-art/Main.java | 68 ---------------------- 1 file changed, 68 deletions(-) delete mode 100644 test/597-app-images-same-classloader/src-art/Main.java (limited to 'test/597-app-images-same-classloader/src-art/Main.java') diff --git a/test/597-app-images-same-classloader/src-art/Main.java b/test/597-app-images-same-classloader/src-art/Main.java deleted file mode 100644 index 96a902c96e..0000000000 --- a/test/597-app-images-same-classloader/src-art/Main.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2020 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 dalvik.system.PathClassLoader; - -class Main { - static final String TEST_NAME = "597-app-images-same-classloader"; - - static final String DEX_FILE = System.getenv("DEX_LOCATION") + "/" + TEST_NAME + ".jar"; - static final String LIBRARY_SEARCH_PATH = System.getProperty("java.library.path"); - - static final String SECONDARY_NAME = TEST_NAME + "-ex"; - static final String SECONDARY_DEX_FILE = - System.getenv("DEX_LOCATION") + "/" + SECONDARY_NAME + ".jar"; - - public static void main(String[] args) throws Exception { - System.loadLibrary(args[0]); - - testLoadingSecondaryAppImageInLoadedClassLoader(); - } - - public static native boolean checkAppImageLoaded(String name); - public static native boolean checkAppImageContains(Class klass); - public static native boolean checkInitialized(Class klass); - - public static void testLoadingSecondaryAppImageInLoadedClassLoader() throws Exception { - // Sanity check that the image isn't already loaded so we don't get bogus results below - assertFalse("Secondary app image isn't already loaded", - checkAppImageLoaded(SECONDARY_NAME)); - - PathClassLoader pcl = new PathClassLoader(DEX_FILE, LIBRARY_SEARCH_PATH, null); - pcl.addDexPath(SECONDARY_DEX_FILE); - - assertTrue("Ensure app image is loaded if it should be", - checkAppImageLoaded(SECONDARY_NAME)); - - Class secondaryCls = pcl.loadClass("Secondary"); - assertTrue("Ensure Secondary class is in the app image", - checkAppImageContains(secondaryCls)); - assertTrue("Ensure Secondary class is preinitialized", checkInitialized(secondaryCls)); - - secondaryCls.getDeclaredMethod("go").invoke(null); - } - - private static void assertTrue(String message, boolean flag) { - if (flag) { - return; - } - throw new AssertionError(message); - } - - private static void assertFalse(String message, boolean flag) { - assertTrue(message, !flag); - } -} -- cgit v1.2.3-59-g8ed1b