diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-20 00:01:06 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-20 00:01:06 +0000 |
| commit | 112023bcaae00578f0f9f8deee9a60065f842cf3 (patch) | |
| tree | c1c4070a11b228f6fdf14738d65bc5de52bfb988 | |
| parent | 7d265fe43478c6c3d52d04941cf284f093d97f16 (diff) | |
| parent | 2e182ca6ef850dabe4da7f114ded10f1549737b0 (diff) | |
| download | art-android-t-preview-1.tar.gz | |
Merge cherrypicks of [16671234] into tm-preview1-release.android-t-preview-2android-t-preview-1android-t-beta-3android-t-preview-1
Change-Id: Ib3de1a0c25825582f6a9ceb6c967cc3a82b95785
| -rw-r--r-- | runtime/oat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/oat.h b/runtime/oat.h index 36ef459645..7e5e7e9c9b 100644 --- a/runtime/oat.h +++ b/runtime/oat.h @@ -32,8 +32,8 @@ class InstructionSetFeatures; class PACKED(4) OatHeader { public: static constexpr std::array<uint8_t, 4> kOatMagic { { 'o', 'a', 't', '\n' } }; - // Last oat version changed reason: ARM64: Enable implicit suspend checks; madvise(). - static constexpr std::array<uint8_t, 4> kOatVersion { { '2', '1', '9', '\0' } }; + // Last oat version changed reason: bump version after compiler/runtime bug. + static constexpr std::array<uint8_t, 4> kOatVersion { { '2', '2', '0', '\0' } }; static constexpr const char* kDex2OatCmdLineKey = "dex2oat-cmdline"; static constexpr const char* kDebuggableKey = "debuggable"; |