commit f7a9ce317f21831febb99a58fddded9207556d98
author Dave Allison <dallison@google.com> Mon Jun 02 18:09:33 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 02 18:09:33 2014 +0000
tree 1435bc4e9cacc2bbd26377e2acb03e5a1d5ca6a2
parent d998af1333f7815a1ca14a653741e31aa9415ee3
parent 502a1975e146b288356e49a3af82629637da5ece

am 502a1975: Merge "Switch on implicit checks and bump oat version to force recompilation"

* commit '502a1975e146b288356e49a3af82629637da5ece':
  Switch on implicit checks and bump oat version to force recompilation

runtime/oat.cc

diff --git a/runtime/oat.cc b/runtime/oat.cc
index 9c14a4f..4c4dddb 100644
--- a/runtime/oat.cc
+++ b/runtime/oat.cc
@@ -22,7 +22,7 @@
 namespace art {
 
 const uint8_t OatHeader::kOatMagic[] = { 'o', 'a', 't', '\n' };
-const uint8_t OatHeader::kOatVersion[] = { '0', '3', '0', '\0' };
+const uint8_t OatHeader::kOatVersion[] = { '0', '3', '1', '\0' };
 
 OatHeader::OatHeader() {
   memset(this, 0, sizeof(*this));

runtime/parsed_options.cc

diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc
index db2a61b..72a868e 100644
--- a/runtime/parsed_options.cc
+++ b/runtime/parsed_options.cc
@@ -264,7 +264,7 @@
 #ifdef HAVE_ANDROID_OS
   {
     char buf[PROP_VALUE_MAX];
-    property_get("dalvik.vm.implicit_checks", buf, "none");
+    property_get("dalvik.vm.implicit_checks", buf, "null,stack");
     std::string checks(buf);
     std::vector<std::string> checkvec;
     Split(checks, ',', checkvec);