diff options
| author | Dave Allison <dallison@google.com> | 2014-06-23 14:46:53 -0700 |
|---|---|---|
| committer | Dave Allison <dallison@google.com> | 2014-06-23 15:24:55 -0700 |
| commit | ca3aabac5748c256c42839dd16e8c80a09d99a48 (patch) | |
| tree | d96cb1643a4e544289a1a3b31d35cd24a7126660 /build/Android.oat.mk | |
| parent | 9462a31caedefac3e04bd4aa5088e050ed188b30 (diff) | |
| download | android_art-ca3aabac5748c256c42839dd16e8c80a09d99a48.tar.gz android_art-ca3aabac5748c256c42839dd16e8c80a09d99a48.tar.bz2 android_art-ca3aabac5748c256c42839dd16e8c80a09d99a48.zip | |
Fix implicit check option handling for non-cross-compiles
This fixes an issue where the compiler was not being told to
generate implicit checks but the runtime was expecting them.
Bug: 15747876
Change-Id: I65e7475bac245c44d5094eb666d67bc1af327ab1
Diffstat (limited to 'build/Android.oat.mk')
| -rw-r--r-- | build/Android.oat.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build/Android.oat.mk b/build/Android.oat.mk index fbb7eb36c6..c67a815832 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -42,6 +42,11 @@ $(HOST_CORE_IMG_OUT): $(HOST_CORE_DEX_FILES) $(DEX2OATD_DEPENDENCY) $(HOST_CORE_OAT_OUT): $(HOST_CORE_IMG_OUT) +IMPLICIT_CHECKS_arm := null,stack +IMPLICIT_CHECKS_arm64 := none +IMPLICIT_CHECKS_x86 := none +IMPLICIT_CHECKS_x86_64 := none +IMPLICIT_CHECKS_mips := none define create-oat-target-targets $$($(1)TARGET_CORE_IMG_OUT): $$($(1)TARGET_CORE_DEX_FILES) $$(DEX2OATD_DEPENDENCY) @echo "target dex2oat: $$@ ($$?)" @@ -49,6 +54,7 @@ $$($(1)TARGET_CORE_IMG_OUT): $$($(1)TARGET_CORE_DEX_FILES) $$(DEX2OATD_DEPENDENC $$(hide) $$(DEX2OATD) --runtime-arg -Xms16m --runtime-arg -Xmx16m --image-classes=$$(PRELOADED_CLASSES) $$(addprefix \ --dex-file=,$$(TARGET_CORE_DEX_FILES)) $$(addprefix --dex-location=,$$(TARGET_CORE_DEX_LOCATIONS)) --oat-file=$$($(1)TARGET_CORE_OAT_OUT) \ --oat-location=$$($(1)TARGET_CORE_OAT) --image=$$($(1)TARGET_CORE_IMG_OUT) --base=$$(LIBART_IMG_TARGET_BASE_ADDRESS) \ + --implicit-checks=$(IMPLICIT_CHECKS_$($(1)TARGET_ARCH)) \ --instruction-set=$$($(1)TARGET_ARCH) --instruction-set-features=$$(TARGET_INSTRUCTION_SET_FEATURES) --android-root=$$(PRODUCT_OUT)/system # This "renaming" eases declaration in art/Android.mk @@ -58,7 +64,7 @@ $$($(1)TARGET_CORE_OAT_OUT): $$($(1)TARGET_CORE_IMG_OUT) endef ifdef TARGET_2ND_ARCH -$(eval $(call create-oat-target-targets,2ND_)) + $(eval $(call create-oat-target-targets,2ND_)) endif $(eval $(call create-oat-target-targets,)) |