Revert^4 "[art] Enable compilation of secondary dexes by default i..."

This reverts commit f5d83b3a550496f6ef120606de9920b3fb85baf1.

Reason for revert: Blacklist more tests expected to fail. Fix up
                   run script.

Bug: 149098478
Test: art/test/testrunner/testrunner.py -b --host
Test: art/test/testrunner/testrunner.py -b --host -t 596-app-images -t 660-clinit
Test: art/test/testrunner/testrunner.py -b --host -t 597-app-images-same-classloader
Test: art/test/testrunner/testrunner.py -b --host --debuggable
Test: art/test/testrunner/testrunner.py -b --host --all-jvmti -t 596 -t 597-app-images-same-classloader
Test: art/test/testrunner/testrunner.py -b --target -t 596 -t 597-app-images-same-classloader
Change-Id: If84e1cb941e64be9907cd7e9ce1ec30ce32f46c7

1 files changed, 68 insertions, 0 deletions

diff --git a/test/597-app-images-same-classloader/src-art/Main.java b/test/597-app-images-same-classloader/src-art/Main.java
new file mode 100644
index 0000000000..96a902c96e
--- /dev/null
+++ b/test/597-app-images-same-classloader/src-art/Main.java
@@ -0,0 +1,68 @@
+/*
+ * 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);
+  }
+}