diff options
| author | Dave Allison <dallison@google.com> | 2014-06-02 18:06:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-02 18:06:48 +0000 |
| commit | 502a1975e146b288356e49a3af82629637da5ece (patch) | |
| tree | 4119dcef52d572576d8b978316f3aeca6680ccd0 /runtime | |
| parent | a3209fae94bf7db935b235cc97a4852721accd3e (diff) | |
| parent | c0cf944b21ff07963660b780fd5d3701cc9215ab (diff) | |
| download | art-502a1975e146b288356e49a3af82629637da5ece.zip art-502a1975e146b288356e49a3af82629637da5ece.tar.gz art-502a1975e146b288356e49a3af82629637da5ece.tar.bz2 | |
Merge "Switch on implicit checks and bump oat version to force recompilation"
Diffstat (limited to 'runtime')
| -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 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)); 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 @@ 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); |