diff options
author | Elliott Hughes <enh@google.com> | 2021-05-07 15:57:48 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-07 15:57:48 +0000 |
commit | 7f25add8eade4087e423318f09e05d102490dcba (patch) | |
tree | 28fbe268bf51b1364ab6c0f0266a6f3c775fcf98 | |
parent | 30b8cc3ef7d75b0b65b633c9c56d6df542646f70 (diff) | |
parent | ee60e455c3b8d8448cc18b6dd07b6ed0ea2f6c0b (diff) | |
download | zlib-7f25add8eade4087e423318f09e05d102490dcba.tar.gz |
Merge "Upgrade zlib to eb9ce8c993117f27ea0e5bccc0f2fee2a5323066" am: b0e91867e8 am: 486d6fa6b2 am: 770b37c5ee am: ee60e455c3android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/1698985
Change-Id: I8fc9d99a7b9b1399fad8e1cae9c94e20b7b0a650
-rw-r--r-- | METADATA | 6 | ||||
-rw-r--r-- | contrib/bench/zlib_bench.cc | 9 | ||||
-rw-r--r-- | google/zip_reader_unittest.cc | 5 |
3 files changed, 10 insertions, 10 deletions
@@ -5,11 +5,11 @@ third_party { 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 } } 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 @@ bool get_compression(int argc, char* argv[], int* value) { 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); } 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 @@ TEST_F(ZipReaderTest, ExtractCurrentEntryToString) { 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(); } |