diff options
| author | Vladimir Marko <vmarko@google.com> | 2015-01-27 10:48:44 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2015-01-27 13:41:29 +0000 |
| commit | 949c91fb91f40a4a80b2b492913cf8541008975e (patch) | |
| tree | 45c840d1d6fd0ab71d96cb6c61931f468b3a0adf /runtime/oat.h | |
| parent | aeb47bb12420e65b4b5f61164e6396ea93734a0a (diff) | |
| download | art-949c91fb91f40a4a80b2b492913cf8541008975e.zip art-949c91fb91f40a4a80b2b492913cf8541008975e.tar.gz art-949c91fb91f40a4a80b2b492913cf8541008975e.tar.bz2 | |
Revert "ART: Implement X86 hard float (Quick/JNI/Baseline)"
And the 3 Mac build fixes. Fix conflicts in context_x86.* .
This reverts commits
3d2c8e74c27efee58e24ec31441124f3f21384b9 ,
34eda1dd66b92a361797c63d57fa19e83c08a1b4 ,
f601d1954348b71186fa160a0ae6a1f4f1c5aee6 ,
bc503348a1da573488503cc2819c9e30807bea31 .
Bug: 19150481
Change-Id: I6650ee30a7d261159380fe2119e14379e4dc9970
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 3e28606..8e63d3a 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', '4', '\0' }; + static constexpr uint8_t kOatVersion[] = { '0', '5', '3', '\0' }; static constexpr const char* kImageLocationKey = "image-location"; static constexpr const char* kDex2OatCmdLineKey = "dex2oat-cmdline"; |