diff options
| author | Dave Allison <dallison@google.com> | 2014-04-08 23:08:12 +0000 |
|---|---|---|
| committer | Dave Allison <dallison@google.com> | 2014-04-09 13:18:07 -0700 |
| commit | f9487c039efb4112616d438593a2ab02792e0304 (patch) | |
| tree | 95f88645bec774d3e8df170bd0f40e4cd0911a34 /runtime/oat.cc | |
| parent | b24b0e2bb128532945b31ea62715776d7751f84d (diff) | |
| download | art-f9487c039efb4112616d438593a2ab02792e0304.tar.gz art-f9487c039efb4112616d438593a2ab02792e0304.tar.bz2 art-f9487c039efb4112616d438593a2ab02792e0304.zip | |
Revert "Revert "Use trampolines for calls to helpers""
This reverts commit 081f73e888b3c246cf7635db37b7f1105cf1a2ff.
Change-Id: Ibd777f8ce73cf8ed6c4cb81d50bf6437ac28cb61
Conflicts:
compiler/dex/quick/mir_to_lir.h
Diffstat (limited to 'runtime/oat.cc')
| -rw-r--r-- | runtime/oat.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/oat.cc b/runtime/oat.cc index 246e090f22..b8d371cffe 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', '2', '0', '\0' }; +const uint8_t OatHeader::kOatVersion[] = { '0', '2', '1', '\0' }; OatHeader::OatHeader() { memset(this, 0, sizeof(*this)); |