summaryrefslogtreecommitdiff
path: root/runtime/oat.h
diff options
context:
space:
mode:
author Calin Juravle <calin@google.com> 2017-07-18 16:51:51 -0700
committer Calin Juravle <calin@google.com> 2017-07-18 17:02:27 -0700
commita308a327884920cbb1e3e62964c4b5a01c29af8c (patch)
tree4bd09065c52f18685dc9e10d9eabdcdb29a51539 /runtime/oat.h
parentbacafb19fa654fb6c7ad610305bed45c2e4682e8 (diff)
Change kMultiDexSeparator from ':' to '!'
The ':' separator is commonly used to separate class path elements. That means that we cannot easily encode multidex location in a classpath without complicating the parsing logic unnecessarily (e.g. when encoding classpaths in the oat file). For easy parsing and understanding kMultiDexSeparator and kClassPathSeparator should have different values. ':' is a wide spread classpath separator so this CL changes the value of kMultiDexSeparator to '!' which is also commonly used to denote an object inside a given container. Test: m test-art-host Bug: 38138251 Change-Id: I30995c553d9131478c6c071b27327df6d2de06a7
Diffstat (limited to 'runtime/oat.h')
-rw-r--r--runtime/oat.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/oat.h b/runtime/oat.h
index f4edb16bce..de4b942bad 100644
--- a/runtime/oat.h
+++ b/runtime/oat.h
@@ -32,8 +32,8 @@ class InstructionSetFeatures;
class PACKED(4) OatHeader {
public:
static constexpr uint8_t kOatMagic[] = { 'o', 'a', 't', '\n' };
- // Last oat version changed reason: add new class status to skip superclass validation.
- static constexpr uint8_t kOatVersion[] = { '1', '2', '9', '\0' };
+ // Last oat version changed reason: update kMultiDexSeparator from ':' to '!'.
+ static constexpr uint8_t kOatVersion[] = { '1', '3', '0', '\0' };
static constexpr const char* kImageLocationKey = "image-location";
static constexpr const char* kDex2OatCmdLineKey = "dex2oat-cmdline";