diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-07-11 08:26:40 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-07-11 08:26:40 +0000 |
| commit | 0025a86411145eb7cd4971f9234fc21c7b4aced1 (patch) | |
| tree | 933b8b96ea970c23a7b3ce313c7c6d46f807dadd /build/Android.oat.mk | |
| parent | 7fb36ded9cd5b1d254b63b3091f35c1e6471b90e (diff) | |
| download | art-0025a86411145eb7cd4971f9234fc21c7b4aced1.zip art-0025a86411145eb7cd4971f9234fc21c7b4aced1.tar.gz art-0025a86411145eb7cd4971f9234fc21c7b4aced1.tar.bz2 | |
Revert "Revert "Revert "Add implicit null and stack checks for x86"""
Broke the build.
This reverts commit 7fb36ded9cd5b1d254b63b3091f35c1e6471b90e.
Change-Id: I9df0e7446ff0913a0e1276a558b2ccf6c8f4c949
Diffstat (limited to 'build/Android.oat.mk')
| -rw-r--r-- | build/Android.oat.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build/Android.oat.mk b/build/Android.oat.mk index 10936a4..61a2cde 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -48,6 +48,11 @@ ifneq ($(HOST_PREFER_32_BIT),true) $(eval $(call create-core-oat-host-rules,2ND_)) endif +IMPLICIT_CHECKS_arm := null,stack +IMPLICIT_CHECKS_arm64 := none +IMPLICIT_CHECKS_x86 := none +IMPLICIT_CHECKS_x86_64 := none +IMPLICIT_CHECKS_mips := none define create-core-oat-target-rules $$($(1)TARGET_CORE_IMG_OUT): $$($(1)TARGET_CORE_DEX_FILES) $$(DEX2OATD_DEPENDENCY) @echo "target dex2oat: $$@ ($$?)" @@ -58,6 +63,7 @@ $$($(1)TARGET_CORE_IMG_OUT): $$($(1)TARGET_CORE_DEX_FILES) $$(DEX2OATD_DEPENDENC --oat-location=$$($(1)TARGET_CORE_OAT) --image=$$($(1)TARGET_CORE_IMG_OUT) \ --base=$$(LIBART_IMG_TARGET_BASE_ADDRESS) --instruction-set=$$($(1)TARGET_ARCH) \ --instruction-set-features=$$($(1)TARGET_INSTRUCTION_SET_FEATURES) \ + --implicit-checks=$(IMPLICIT_CHECKS_$($(1)TARGET_ARCH)) \ --android-root=$$(PRODUCT_OUT)/system --include-patch-information # This "renaming" eases declaration in art/Android.mk |