Do coverage tests on package.apk.unaligned
Instead of package.apk, which may be stripped off classes.dex.
Change-Id: I3ff49007013492be5b72dd4fa5c1d815557670f8
diff --git a/CtsTestCoverage.mk b/CtsTestCoverage.mk
index f6cc568..8e00913 100644
--- a/CtsTestCoverage.mk
+++ b/CtsTestCoverage.mk
@@ -69,6 +69,8 @@
$(hide) echo $(1): file://$(ANDROID_BUILD_TOP)/$(coverage_out)/$(5)
endef
+# classes.dex is stripped from package.apk if dex-preopt is enabled,
+# so we use the copy that definitely includes classes.dex.
define add-testcase-apk
- $(1) += $(call intermediates-dir-for,APPS,$(2))/package.apk
+ $(1) += $(call intermediates-dir-for,APPS,$(2))/package.apk.unaligned
endef