diff options
Diffstat (limited to 'test/846-multidex-data-image/src-art/Main.java')
| -rw-r--r-- | test/846-multidex-data-image/src-art/Main.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/846-multidex-data-image/src-art/Main.java b/test/846-multidex-data-image/src-art/Main.java index aea92a46a7..8e425d1cb3 100644 --- a/test/846-multidex-data-image/src-art/Main.java +++ b/test/846-multidex-data-image/src-art/Main.java @@ -48,7 +48,7 @@ public class Main { if (args.length == 2 && "--second-run".equals(args[1])) { DexFile.OptimizationInfo info = VMRuntime.getBaseApkOptimizationInfo(); - if (!info.isOptimized()) { + if (!info.isOptimized() && !isInImageSpace(Main.class)) { throw new Error("Expected image to be loaded"); } } @@ -77,6 +77,7 @@ public class Main { private static native boolean hasOatFile(); private static native boolean hasImage(); private static native String getCompilerFilter(Class<?> cls); + private static native boolean isInImageSpace(Class<?> cls); private static final String TEMP_FILE_NAME_PREFIX = "temp"; private static final String TEMP_FILE_NAME_SUFFIX = "-file"; |