From 9353a3be5fca8a83c3a60e890fbca323f9fb0e04 Mon Sep 17 00:00:00 2001 From: Brian Muramatsu Date: Wed, 7 Sep 2011 18:12:22 -0700 Subject: [PATCH] Disable Dexpreopt for generic_arm5 Bug 5267392 After coming across another place where I would have to use package.apk.unaligned, I decided maybe it is best to just disable dexpreopt as was previously suggested. Use package.apks in the CTS Makefile task. Change-Id: Iec839a72f4b53441337523b8a9cccda657eec8e8 --- core/tasks/cts.mk | 2 +- target/board/generic_arm5/BoardConfig.mk | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index 62e7da36e..8c36ef6bd 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -174,7 +174,7 @@ $(call dist-for-goals,cts,$(INTERNAL_CTS_TARGET)) 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 diff --git a/target/board/generic_arm5/BoardConfig.mk b/target/board/generic_arm5/BoardConfig.mk index 685fcb1f7..d8fa2feb7 100644 --- a/target/board/generic_arm5/BoardConfig.mk +++ b/target/board/generic_arm5/BoardConfig.mk @@ -19,3 +19,5 @@ include build/target/board/generic/BoardConfig.mk TARGET_ARCH_VARIANT := TARGET_CPU_ABI := armeabi TARGET_CPU_ABI2 := + +WITH_DEXPREOPT := false