diff options
| -rw-r--r-- | runtime/oat.cc | 2 | ||||
| -rw-r--r-- | runtime/parsed_options.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/oat.cc b/runtime/oat.cc index 9c14a4fb88..4c4dddbaa9 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)); diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc index db2a61be15..72a868edc1 100644 --- a/runtime/parsed_options.cc +++ b/runtime/parsed_options.cc @@ -264,7 +264,7 @@ bool ParsedOptions::Parse(const Runtime::Options& options, bool ignore_unrecogni #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); |