diff options
| author | 2020-02-10 07:08:48 -0800 | |
|---|---|---|
| committer | 2020-03-05 18:28:31 +0000 | |
| commit | 9a01d30bd78d90491a829ce1b06ede01f21fbf67 (patch) | |
| tree | e5e897311284c6541382fcac534e0302930a8d46 /test/138-duplicate-classes-check/src-art/Main.java | |
| parent | 310432e7c8b36a2d112376fb76369d4c2487763d (diff) | |
Revert^2 "[art] Enable compilation of secondary dexes by default i..."
Reason for revert: blacklist unsupported cases. Underlying issues have been
fixed in other CLs.
Merges the three separate original CLs.
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
Change-Id: I0ffdfcc7788b76c16cbbde73e0b377062b18a905
Diffstat (limited to 'test/138-duplicate-classes-check/src-art/Main.java')
| -rw-r--r-- | test/138-duplicate-classes-check/src-art/Main.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/138-duplicate-classes-check/src-art/Main.java b/test/138-duplicate-classes-check/src-art/Main.java index b32f0bcc46..35d0209af8 100644 --- a/test/138-duplicate-classes-check/src-art/Main.java +++ b/test/138-duplicate-classes-check/src-art/Main.java @@ -14,7 +14,7 @@ * limitations under the License. */ -import dalvik.system.DexClassLoader; +import dalvik.system.PathClassLoader; import java.io.File; import java.lang.reflect.Method; @@ -32,9 +32,8 @@ public class Main { // Now run the class from the -ex file. String dexPath = System.getenv("DEX_LOCATION") + "/138-duplicate-classes-check-ex.jar"; - String optimizedDirectory = System.getenv("DEX_LOCATION"); String librarySearchPath = null; - DexClassLoader loader = new DexClassLoader(dexPath, optimizedDirectory, librarySearchPath, + PathClassLoader loader = new PathClassLoader(dexPath, librarySearchPath, getClass().getClassLoader()); try { |