diff options
author | Brian Muramatsu <btmura@google.com> | 2011-09-07 18:12:22 -0700 |
---|---|---|
committer | Brian Muramatsu <btmura@google.com> | 2011-09-07 18:12:22 -0700 |
commit | 9353a3be5fca8a83c3a60e890fbca323f9fb0e04 (patch) | |
tree | 8f226bcf2bd24dc81e9fe50032334bf86b66073d | |
parent | 31e27eebc3108d788d040228e5143df3e87b1424 (diff) | |
download | replicant_build-9353a3be5fca8a83c3a60e890fbca323f9fb0e04.zip replicant_build-9353a3be5fca8a83c3a60e890fbca323f9fb0e04.tar.gz replicant_build-9353a3be5fca8a83c3a60e890fbca323f9fb0e04.tar.bz2 |
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
-rw-r--r-- | core/tasks/cts.mk | 2 | ||||
-rw-r--r-- | target/board/generic_arm5/BoardConfig.mk | 2 |
2 files changed, 3 insertions, 1 deletions
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 @@ $(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 685fcb1..d8fa2fe 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 |