diff options
Diffstat (limited to 'chromium/third_party/zlib/google')
10 files changed, 24 insertions, 17 deletions
diff --git a/chromium/third_party/zlib/google/BUILD.gn b/chromium/third_party/zlib/google/BUILD.gn index 4eddc61d283..a49b8c81b2a 100644 --- a/chromium/third_party/zlib/google/BUILD.gn +++ b/chromium/third_party/zlib/google/BUILD.gn @@ -21,18 +21,18 @@ if (build_with_chromium) { "//third_party/zlib:minizip", ] } -} -static_library("compression_utils") { - sources = [ - "compression_utils.cc", - "compression_utils.h", - ] - deps = [ - ":compression_utils_portable", - "//base", - "//third_party/zlib", - ] + static_library("compression_utils") { + sources = [ + "compression_utils.cc", + "compression_utils.h", + ] + deps = [ + ":compression_utils_portable", + "//base", + "//third_party/zlib", + ] + } } # This allows other users of Chromium's zlib library, but don't use Chromium's @@ -42,5 +42,5 @@ static_library("compression_utils_portable") { "compression_utils_portable.cc", "compression_utils_portable.h", ] - deps = [ "//third_party/zlib" ] + public_deps = [ "//third_party/zlib" ] } diff --git a/chromium/third_party/zlib/google/DEPS b/chromium/third_party/zlib/google/DEPS index 144fbd14929..03f2cb950b9 100644 --- a/chromium/third_party/zlib/google/DEPS +++ b/chromium/third_party/zlib/google/DEPS @@ -2,4 +2,5 @@ include_rules = [ '+base', '+build', '+testing', + "+third_party/zlib/zlib.h", ] diff --git a/chromium/third_party/zlib/google/compression_utils.cc b/chromium/third_party/zlib/google/compression_utils.cc index 9f63a840167..d6ee2b61f70 100644 --- a/chromium/third_party/zlib/google/compression_utils.cc +++ b/chromium/third_party/zlib/google/compression_utils.cc @@ -5,7 +5,7 @@ #include "third_party/zlib/google/compression_utils.h" #include "base/bit_cast.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/process/memory.h" #include "base/strings/string_piece.h" #include "base/sys_byteorder.h" diff --git a/chromium/third_party/zlib/google/compression_utils_portable.cc b/chromium/third_party/zlib/google/compression_utils_portable.cc index 2926810446f..331e41e1257 100644 --- a/chromium/third_party/zlib/google/compression_utils_portable.cc +++ b/chromium/third_party/zlib/google/compression_utils_portable.cc @@ -5,7 +5,7 @@ * found in the Chromium source repository LICENSE file. */ -#include "third_party/zlib/google/compression_utils_portable.h" +#include "compression_utils_portable.h" #include <stddef.h> #include <stdlib.h> diff --git a/chromium/third_party/zlib/google/compression_utils_portable.h b/chromium/third_party/zlib/google/compression_utils_portable.h index cd004e86cf5..c1f377571fb 100644 --- a/chromium/third_party/zlib/google/compression_utils_portable.h +++ b/chromium/third_party/zlib/google/compression_utils_portable.h @@ -9,10 +9,14 @@ #include <stdint.h> +/* TODO(cavalcantii): remove support for Chromium ever building with a system + * zlib. + */ #if defined(USE_SYSTEM_ZLIB) #include <zlib.h> +/* AOSP build requires relative paths. */ #else -#include "third_party/zlib/zlib.h" +#include "zlib.h" #endif namespace zlib_internal { diff --git a/chromium/third_party/zlib/google/compression_utils_unittest.cc b/chromium/third_party/zlib/google/compression_utils_unittest.cc index b0e04b8c973..398984bb2e7 100644 --- a/chromium/third_party/zlib/google/compression_utils_unittest.cc +++ b/chromium/third_party/zlib/google/compression_utils_unittest.cc @@ -9,7 +9,6 @@ #include <string> -#include "base/logging.h" #include "base/stl_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chromium/third_party/zlib/google/zip_internal.cc b/chromium/third_party/zlib/google/zip_internal.cc index a67b6c94358..9cbb78cb58b 100644 --- a/chromium/third_party/zlib/google/zip_internal.cc +++ b/chromium/third_party/zlib/google/zip_internal.cc @@ -10,6 +10,7 @@ #include <algorithm> #include "base/logging.h" +#include "base/notreached.h" #include "base/strings/utf_string_conversions.h" #if defined(USE_SYSTEM_MINIZIP) diff --git a/chromium/third_party/zlib/google/zip_reader_unittest.cc b/chromium/third_party/zlib/google/zip_reader_unittest.cc index 87190c7e0de..bba4365298b 100644 --- a/chromium/third_party/zlib/google/zip_reader_unittest.cc +++ b/chromium/third_party/zlib/google/zip_reader_unittest.cc @@ -12,11 +12,11 @@ #include <string> #include "base/bind.h" +#include "base/check.h" #include "base/files/file.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/hash/md5.h" -#include "base/logging.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/stl_util.h" diff --git a/chromium/third_party/zlib/google/zip_unittest.cc b/chromium/third_party/zlib/google/zip_unittest.cc index 7ea3c36c2a8..10f2ef7a974 100644 --- a/chromium/third_party/zlib/google/zip_unittest.cc +++ b/chromium/third_party/zlib/google/zip_unittest.cc @@ -16,6 +16,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/logging.h" #include "base/macros.h" #include "base/path_service.h" #include "base/strings/string_util.h" diff --git a/chromium/third_party/zlib/google/zip_writer.cc b/chromium/third_party/zlib/google/zip_writer.cc index 1f2f073b30c..6f38d42b6ba 100644 --- a/chromium/third_party/zlib/google/zip_writer.cc +++ b/chromium/third_party/zlib/google/zip_writer.cc @@ -5,6 +5,7 @@ #include "third_party/zlib/google/zip_writer.h" #include "base/files/file.h" +#include "base/logging.h" #include "base/strings/string_util.h" #include "third_party/zlib/google/zip_internal.h" |