commit 164285e05f75c770dc936dc51b01ce93983d9831
author Brian Muramatsu <btmura@google.com> Fri Sep 09 12:04:27 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 09 12:04:27 2011 -0700
tree 94dbba8144f1101fa7a921b50b6aaca7327b455f
parent c5c28657510799c1b5085473b5c050f160c4a654
parent 8658fa51d15290cf43178d0633b53f11ff08a4aa

am 8658fa51: am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5

* commit '8658fa51d15290cf43178d0633b53f11ff08a4aa':
  Disable Dexpreopt for generic_arm5

core/tasks/cts.mk

diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index 975c4f4..af20da8 100644
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -201,7 +201,7 @@
 
 define copy-testcase-apk
 
-$(hide) $(ACP) -fp $(call intermediates-dir-for,APPS,$(1))/package.apk.unaligned \
+$(hide) $(ACP) -fp $(call intermediates-dir-for,APPS,$(1))/package.apk \
 	$(PRIVATE_DIR)/repository/testcases/$(1).apk
 
 endef

target/board/generic_arm5/BoardConfig.mk

diff --git a/target/board/generic_arm5/BoardConfig.mk b/target/board/generic_arm5/BoardConfig.mk
index 685fcb1..d8fa2fe 100644
--- a/target/board/generic_arm5/BoardConfig.mk
+++ b/target/board/generic_arm5/BoardConfig.mk
@@ -19,3 +19,5 @@
 TARGET_ARCH_VARIANT :=
 TARGET_CPU_ABI := armeabi
 TARGET_CPU_ABI2 :=
+
+WITH_DEXPREOPT := false