commit 3544c2604fc833c89a68e5fb4e563cf0a231cfb0
author Elliott Hughes <enh@google.com> Fri May 07 15:56:33 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 07 15:56:33 2021 +0000
tree 28fbe268bf51b1364ab6c0f0266a6f3c775fcf98
parent 4c20ca7cc4ed786c179fda6a1d645f06de4e2d86
parent ee60e455c3b8d8448cc18b6dd07b6ed0ea2f6c0b

Merge "Upgrade zlib to eb9ce8c993117f27ea0e5bccc0f2fee2a5323066" am: b0e91867e8 am: 486d6fa6b2 am: 770b37c5ee am: ee60e455c3

Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/1698985

Change-Id: Id2f4215b0d980c2ca541a4dab48f061dc15ebb60

METADATA

diff --git a/METADATA b/METADATA
index 23b4d00..423792a 100644
--- a/METADATA
+++ b/METADATA
@@ -5,11 +5,11 @@
     type: GIT
     value: "https://chromium.googlesource.com/chromium/src/third_party/zlib/"
   }
-  version: "09490503d0f201b81e03f5ca0ab8ba8ee76d4a8e"
+  version: "eb9ce8c993117f27ea0e5bccc0f2fee2a5323066"
   license_type: NOTICE
   last_upgrade_date {
     year: 2021
-    month: 4
-    day: 1
+    month: 5
+    day: 6
   }
 }

contrib/bench/zlib_bench.cc

diff --git a/contrib/bench/zlib_bench.cc b/contrib/bench/zlib_bench.cc
index bc2f741..bd06ad3 100644
--- a/contrib/bench/zlib_bench.cc
+++ b/contrib/bench/zlib_bench.cc
@@ -15,7 +15,7 @@
  * Note this code can be compiled outside of the Chromium build system against
  * the system zlib (-lz) with g++ or clang++ as follows:
  *
- *   g++|clang++ -O3 -Wall -std=c++11 -lstdc++ -lz zlib_bench.cc
+ *   g++|clang++ -O3 -Wall -std=c++11 zlib_bench.cc -lstdc++ -lz
  */
 
 #include <algorithm>
@@ -306,11 +306,10 @@
   return *value >= 0 && *value <= 9;
 }
 
+const char* options = "gzip|zlib|raw [--compression 0:9] [--huffman|--rle]";
+
 void usage_exit(const char* program) {
-  printf(
-      "usage: %s gzip|zlib|raw [--compression 0:9] [--huffman|--rle] "
-      "files...\n",
-      program);
+  printf("usage: %s %s files...", program, options);
   exit(1);
 }
 

google/zip_reader_unittest.cc

diff --git a/google/zip_reader_unittest.cc b/google/zip_reader_unittest.cc
index bba4365..44134f8 100644
--- a/google/zip_reader_unittest.cc
+++ b/google/zip_reader_unittest.cc
@@ -20,6 +20,7 @@
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/task_environment.h"
@@ -510,12 +511,12 @@
     if (i > 0) {
       // Exact byte read limit: must pass.
       EXPECT_TRUE(reader.ExtractCurrentEntryToString(i, &contents));
-      EXPECT_EQ(base::StringPiece("0123456", i).as_string(), contents);
+      EXPECT_EQ(std::string(base::StringPiece("0123456", i)), contents);
     }
 
     // More than necessary byte read limit: must pass.
     EXPECT_TRUE(reader.ExtractCurrentEntryToString(16, &contents));
-    EXPECT_EQ(base::StringPiece("0123456", i).as_string(), contents);
+    EXPECT_EQ(std::string(base::StringPiece("0123456", i)), contents);
   }
   reader.Close();
 }