Revert "[art] Expand test coverage of secondary app images"

Revert "[dexopt] Allow secondary dex files to generate app images"

Revert submission 1210624-secimg

Bug: 149098478
Bug: 149168708

Reason for revert: Tests fail on device
Reverted Changes:
I87a0c2698: [art] Fix, re-enable and expand 596-app-images
I73592c597: [art] Enable compilation of secondary dexes by def...
I6cff0c8f2: [art] Expand test coverage of secondary app images...
Iaa04175ee: [dexopt] Allow secondary dex files to generate app...

Change-Id: I8616e3962e7834a15bd9d83c635b50b556ab9a76

7 files changed, 0 insertions, 118 deletions

diff --git a/test/597-app-images-same-classloader/expected.txt b/test/597-app-images-same-classloader/expected.txt
deleted file mode 100644
index ff3be57faf..0000000000
--- a/test/597-app-images-same-classloader/expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-JNI_OnLoad called
-Secondary went
diff --git a/test/597-app-images-same-classloader/info.txt b/test/597-app-images-same-classloader/info.txt
deleted file mode 100644
index 38f6e707ac..0000000000
--- a/test/597-app-images-same-classloader/info.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Tests that loading an app image into an already existent classloader works if
-the classloader context is correct.
diff --git a/test/597-app-images-same-classloader/profile b/test/597-app-images-same-classloader/profile
deleted file mode 100644
index c7406e217e..0000000000
--- a/test/597-app-images-same-classloader/profile
+++ /dev/null
@@ -1,2 +0,0 @@
-LMain;
-LSecondary;
diff --git a/test/597-app-images-same-classloader/run b/test/597-app-images-same-classloader/run
deleted file mode 100644
index 496273fed9..0000000000
--- a/test/597-app-images-same-classloader/run
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-# We need a profile to tell dex2oat to include classes in the final app image
-exec ${RUN} --profile --secondary-class-loader-context "PCL[$DEX_LOCATION/$TEST_NAME.jar]" $@
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);
-  }
-}
diff --git a/test/597-app-images-same-classloader/src-ex/Secondary.java b/test/597-app-images-same-classloader/src-ex/Secondary.java
deleted file mode 100644
index 36eee8867c..0000000000
--- a/test/597-app-images-same-classloader/src-ex/Secondary.java
+++ /dev/null
@@ -1,21 +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.
- */
-
-public class Secondary {
-  public static void go() {
-    System.out.println("Secondary went");
-  }
-}
diff --git a/test/knownfailures.json b/test/knownfailures.json
index d4d279c2e8..34856a13b2 100644
--- a/test/knownfailures.json
+++ b/test/knownfailures.json
@@ -308,11 +308,6 @@
         "variant": "interp-ac"
     },
     {
-        "tests": "597-app-images-same-classloader",
-        "description": "not generated when using the access check configuration",
-        "variant": "interp-ac"
-    },
-    {
         "tests": "055-enum-performance",
         "variant": "optimizing | regalloc_gc",
         "description": ["055: Exceeds run time limits due to heap poisoning ",