commit a218b3ef41b17dfb77f79930b46768b99d8ce5d8
author Mathieu Chartier <mathieuc@google.com> Fri May 18 14:37:38 2018 -0700
committer Mathieu Chartier <mathieuc@google.com> Fri May 18 14:38:44 2018 -0700
tree b3d10ff277e05e12fd4cbbb4489a85c01d6153e8
parent 064dfe4f9b68484557bfcc0589dc632c2a27770a

Re-enable LZ4_compress_HC in image writer

This mode is probably no longer flaky. If there are issues, it
should be caught by the decoding verification.

Test: test-art-host-gtest
Bug: 27773950

Change-Id: I3310b7447ca77eceddbc93235f756bc57b852b99

dex2oat/linker/image_writer.cc

diff --git a/dex2oat/linker/image_writer.cc b/dex2oat/linker/image_writer.cc
index 492f9ce..01726af 100644
--- a/dex2oat/linker/image_writer.cc
+++ b/dex2oat/linker/image_writer.cc
@@ -248,7 +248,6 @@
 
     CHECK_EQ(image_header->storage_mode_, image_storage_mode_);
     switch (image_storage_mode_) {
-      case ImageHeader::kStorageModeLZ4HC:  // Fall-through.
       case ImageHeader::kStorageModeLZ4: {
         const size_t compressed_max_size = LZ4_compressBound(image_data_size);
         compressed_data.reset(new char[compressed_max_size]);
@@ -257,22 +256,20 @@
             &compressed_data[0],
             image_data_size,
             compressed_max_size);
-
         break;
       }
-      /*
-       * Disabled due to image_test64 flakyness. Both use same decompression. b/27560444
       case ImageHeader::kStorageModeLZ4HC: {
         // Bound is same as non HC.
         const size_t compressed_max_size = LZ4_compressBound(image_data_size);
         compressed_data.reset(new char[compressed_max_size]);
-        data_size = LZ4_compressHC(
+        data_size = LZ4_compress_HC(
             reinterpret_cast<char*>(image_info.image_->Begin()) + sizeof(ImageHeader),
             &compressed_data[0],
-            image_data_size);
+            image_data_size,
+            compressed_max_size,
+            LZ4HC_CLEVEL_MAX);
         break;
       }
-      */
       case ImageHeader::kStorageModeUncompressed: {
         data_size = image_data_size;
         image_data_to_write = image_data;