summaryrefslogtreecommitdiffstats
path: root/build/Android.oat.mk
diff options
context:
space:
mode:
authorDave Allison <dallison@google.com>2014-07-10 01:54:57 +0000
committerDave Allison <dallison@google.com>2014-07-10 01:54:57 +0000
commit3d14eb620716e92c21c4d2c2d11a95be53319791 (patch)
treeaadce4d6bb70e549b74b537c6f75617cf533576a /build/Android.oat.mk
parent34e826ccc80dc1cf7c4c045de6b7f8360d504ccf (diff)
downloadandroid_art-3d14eb620716e92c21c4d2c2d11a95be53319791.tar.gz
android_art-3d14eb620716e92c21c4d2c2d11a95be53319791.tar.bz2
android_art-3d14eb620716e92c21c4d2c2d11a95be53319791.zip
Revert "Add implicit null and stack checks for x86"
It breaks cross compilation with x86_64. This reverts commit 34e826ccc80dc1cf7c4c045de6b7f8360d504ccf. Change-Id: I34ba07821fc0a022fda33a7ae21850957bbec5e7
Diffstat (limited to 'build/Android.oat.mk')
-rw-r--r--build/Android.oat.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index d1caf93021..dd87f4a58e 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -50,7 +50,7 @@ endif
IMPLICIT_CHECKS_arm := null,stack
IMPLICIT_CHECKS_arm64 := none
-IMPLICIT_CHECKS_x86 := null,stack
+IMPLICIT_CHECKS_x86 := none
IMPLICIT_CHECKS_x86_64 := none
IMPLICIT_CHECKS_mips := none
define create-core-oat-target-rules