From 020c79e5f2b61924d6e21e8162f52e992d7b30fe Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Mon, 13 Sep 2021 17:28:00 +0100 Subject: Update .oat version after disabling partial LSE. This will ensure we don't take any .oat file that has the bogus generated code. (cherry picked from commit 776a1c1447be1e504c2013c5d170d08ef4907d7f) (cherry picked from commit 8246b0cbfd4c5e19596e2dac0c1377c56f444d5f) Test: test.py Bug: 197981962 Merged-In: Ic14d18d310bdcd408c1f6e2777ef53a041fb2f12 Change-Id: Ic66ee1998f490c15b95279f3b4881f9581772190 --- runtime/oat.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/oat.h b/runtime/oat.h index ab45b84888..31a328d979 100644 --- a/runtime/oat.h +++ b/runtime/oat.h @@ -32,8 +32,8 @@ class InstructionSetFeatures; class PACKED(4) OatHeader { public: static constexpr std::array kOatMagic { { 'o', 'a', 't', '\n' } }; - // Last oat version changed reason: Apex versions in key/value store. - static constexpr std::array kOatVersion { { '1', '9', '5', '\0' } }; + // Last oat version changed reason: Disable partial LSE b/197818595. + static constexpr std::array kOatVersion { { '1', '9', '9', '\0' } }; static constexpr const char* kDex2OatCmdLineKey = "dex2oat-cmdline"; static constexpr const char* kDebuggableKey = "debuggable"; -- cgit v1.2.3