diff options
| -rw-r--r-- | dexlayout/dexlayout_test.cc | 2 | ||||
| -rw-r--r-- | runtime/jit/profile_compilation_info.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/dexlayout/dexlayout_test.cc b/dexlayout/dexlayout_test.cc index bd6548e65b..56dbb82090 100644 --- a/dexlayout/dexlayout_test.cc +++ b/dexlayout/dexlayout_test.cc @@ -41,7 +41,7 @@ static const char kDexFileLayoutInputDex[] = "AAAAdQEAAAAQAAABAAAAjAEAAA=="; static const char kDexFileLayoutInputProfile[] = - "cHJvADAwNAABCwABAAAAAAD1KW3+Y2xhc3Nlcy5kZXgBAA=="; + "cHJvADAwNQABCwABAAAAAAD1KW3+Y2xhc3Nlcy5kZXgBAA=="; static const char kDexFileLayoutExpectedOutputDex[] = "ZGV4CjAzNQD1KW3+B8NAB0f2A/ZVIBJ0aHrGIqcpVTAUAgAAcAAAAHhWNBIAAAAAAAAAAIwBAAAH" diff --git a/runtime/jit/profile_compilation_info.cc b/runtime/jit/profile_compilation_info.cc index 13dbc3f949..24ea27529a 100644 --- a/runtime/jit/profile_compilation_info.cc +++ b/runtime/jit/profile_compilation_info.cc @@ -37,8 +37,9 @@ namespace art { const uint8_t ProfileCompilationInfo::kProfileMagic[] = { 'p', 'r', 'o', '\0' }; -// Last profile version: fix the order of dex files in the profile. -const uint8_t ProfileCompilationInfo::kProfileVersion[] = { '0', '0', '4', '\0' }; +// Last profile version: fix profman merges. Update profile version to force +// regeneration of possibly faulty profiles. +const uint8_t ProfileCompilationInfo::kProfileVersion[] = { '0', '0', '5', '\0' }; static constexpr uint16_t kMaxDexFileKeyLength = PATH_MAX; |