commit 688514265abf4bb682b5eea3e59fb9d2e34b18b9
author Ying Wang <wangying@google.com> Wed Jul 13 16:14:59 2011 -0700
committer Brian Muramatsu <btmura@android.com> Wed Aug 03 11:52:14 2011 -0700
tree c2aa47d1ffb43214236fce309d8b43f5b4a94360
parent 4b41a9e34b22d95b6a0163313d130b79063c6870

Do coverage tests on package.apk.unaligned

Instead of package.apk, which may be stripped off classes.dex.

Change-Id: Ia9121fe464e618444c3101ea97398af26c6d9730

CtsTestCoverage.mk

diff --git a/CtsTestCoverage.mk b/CtsTestCoverage.mk
index 7053fea..588c8f5 100644
--- a/CtsTestCoverage.mk
+++ b/CtsTestCoverage.mk
@@ -60,6 +60,8 @@
 	$(hide) echo $(1): file://$(ANDROID_BUILD_TOP)/$(COVERAGE_OUT)/$(4)
 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
-	TEST_APKS += $(call intermediates-dir-for,APPS,$(1))/package.apk
+	TEST_APKS += $(call intermediates-dir-for,APPS,$(1))/package.apk.unaligned
 endef