Don't assume the class has never been looked at in FastVerify.
When we compile dex files individually and one FastVerify fails, we may
verify more classes that in the one dex file.
Also fix a bug in VerifierDeps when verifying after failing fast
verification: we need to clear the existing contents to repopulate it.
Bug: 257335641
Test: 845-fast-verify
Change-Id: I92f64daff1653ce3d58cee81ad3b461fa152cb84
diff --git a/test/run_test_build.py b/test/run_test_build.py
index 8a34e21..f2656f0 100755
--- a/test/run_test_build.py
+++ b/test/run_test_build.py
@@ -335,6 +335,10 @@
zip(TEST_NAME + ".jar", "classes.dex")
return
+ if path.exists("classes.dm"):
+ zip(TEST_NAME + ".jar", "classes.dm")
+ return
+
def has_multidex():
return HAS_SRC_MULTIDEX or HAS_JASMIN_MULTIDEX or HAS_SMALI_MULTIDEX