diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-03-19 12:43:20 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-03-19 20:00:50 -0700 |
| commit | d7cbf8a6629942e7bd315ffae7e1c77b082f3e11 (patch) | |
| tree | fc8c3371ed4ddac96bbe90a2f94ef5fb5c5472ee /runtime/oat.h | |
| parent | f5988cf0c47ff935bb19c89ed0398be5fbe44bb6 (diff) | |
| download | art-d7cbf8a6629942e7bd315ffae7e1c77b082f3e11.zip art-d7cbf8a6629942e7bd315ffae7e1c77b082f3e11.tar.gz art-d7cbf8a6629942e7bd315ffae7e1c77b082f3e11.tar.bz2 | |
Change RETURN_VOID_BARRIER to RETURN_VOID_NO_BARRIER
We want to default to having a barrier for the case where we don't
dex to dex.
Bug: 19762303
Change-Id: I60348d89eaf0b9e1e480298afcecbb5f52e8661b
Diffstat (limited to 'runtime/oat.h')
| -rw-r--r-- | runtime/oat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/oat.h b/runtime/oat.h index 79cb024..c4716ce 100644 --- a/runtime/oat.h +++ b/runtime/oat.h @@ -32,7 +32,7 @@ class InstructionSetFeatures; class PACKED(4) OatHeader { public: static constexpr uint8_t kOatMagic[] = { 'o', 'a', 't', '\n' }; - static constexpr uint8_t kOatVersion[] = { '0', '5', '8', '\0' }; + static constexpr uint8_t kOatVersion[] = { '0', '6', '0', '\0' }; static constexpr const char* kImageLocationKey = "image-location"; static constexpr const char* kDex2OatCmdLineKey = "dex2oat-cmdline"; |