diff options
| -rw-r--r-- | runtime/asm_support.h | 2 | ||||
| -rw-r--r-- | runtime/image.cc | 2 | ||||
| -rw-r--r-- | runtime/mirror/string.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/runtime/asm_support.h b/runtime/asm_support.h index c7a94a90dc..4a2e34f243 100644 --- a/runtime/asm_support.h +++ b/runtime/asm_support.h @@ -246,7 +246,7 @@ ADD_TEST_EQ(MIRROR_STRING_COUNT_OFFSET, art::mirror::String::CountOffset().Int32 ADD_TEST_EQ(MIRROR_STRING_VALUE_OFFSET, art::mirror::String::ValueOffset().Int32Value()) // String compression feature. -#define STRING_COMPRESSION_FEATURE 0 +#define STRING_COMPRESSION_FEATURE 1 ADD_TEST_EQ(STRING_COMPRESSION_FEATURE, art::mirror::kUseStringCompression); #if defined(__cplusplus) diff --git a/runtime/image.cc b/runtime/image.cc index 54b099eb14..1acfcf5694 100644 --- a/runtime/image.cc +++ b/runtime/image.cc @@ -25,7 +25,7 @@ namespace art { const uint8_t ImageHeader::kImageMagic[] = { 'a', 'r', 't', '\n' }; -const uint8_t ImageHeader::kImageVersion[] = { '0', '3', '6', '\0' }; // Erroneous resolved class. +const uint8_t ImageHeader::kImageVersion[] = { '0', '3', '7', '\0' }; // Enable string compression. ImageHeader::ImageHeader(uint32_t image_begin, uint32_t image_size, diff --git a/runtime/mirror/string.h b/runtime/mirror/string.h index 38f6dd4b6f..08296c648c 100644 --- a/runtime/mirror/string.h +++ b/runtime/mirror/string.h @@ -32,7 +32,7 @@ class StubTest_ReadBarrierForRoot_Test; namespace mirror { // String Compression -static constexpr bool kUseStringCompression = false; +static constexpr bool kUseStringCompression = true; enum class StringCompressionFlag : uint32_t { kCompressed = 0u, kUncompressed = 1u |