commit 9d014e6570deb3861b503833823e56e1c589626c
author Brian Muramatsu <btmura@google.com> Thu Sep 08 10:24:14 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 08 10:24:14 2011 -0700
tree 482a727103c3fbf5d5e511b271da6cb12589ed29
parent 372a1e0ba362ba509d44a1ed4b8eb554b1da7180
parent 9353a3be5fca8a83c3a60e890fbca323f9fb0e04

am 9353a3be: Disable Dexpreopt for generic_arm5

* commit '9353a3be5fca8a83c3a60e890fbca323f9fb0e04':
  Disable Dexpreopt for generic_arm5

core/tasks/cts.mk

diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index 62e7da3..8c36ef6 100644
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -174,7 +174,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