diff --git a/deps/zlib/BUILD.gn b/deps/zlib/BUILD.gn index afd3e8cc0f38e9..eff72b22a29bb0 100644 --- a/deps/zlib/BUILD.gn +++ b/deps/zlib/BUILD.gn @@ -67,15 +67,10 @@ source_set("zlib_common_headers") { ] } -use_arm_neon_optimizations = false -if ((current_cpu == "arm" || current_cpu == "arm64") && - !(is_win && !is_clang)) { - # TODO(ritownsend@google.com): Optimizations temporarily disabled for - # Windows on Arm MSVC builds, see http://crbug.com/v8/10012. - if (arm_use_neon) { - use_arm_neon_optimizations = true - } -} +# TODO(ritownsend@google.com): Optimizations temporarily disabled for +# Windows on Arm MSVC builds, see http://crbug.com/v8/10012. +use_arm_neon_optimizations = + (current_cpu == "arm" || current_cpu == "arm64") && !(is_win && !is_clang) use_x86_x64_optimizations = (current_cpu == "x86" || current_cpu == "x64") && !is_ios @@ -367,7 +362,7 @@ component("zlib") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - if (zlib_symbols_visible) { + if (is_posix && zlib_symbols_visible) { configs -= [ "//build/config/gcc:symbol_visibility_hidden" ] configs += [ "//build/config/gcc:symbol_visibility_default" ] } diff --git a/src/zlib_version.h b/src/zlib_version.h index 24b241fe6ef844..7ce58e3077bade 100644 --- a/src/zlib_version.h +++ b/src/zlib_version.h @@ -2,5 +2,5 @@ // Refer to tools/dep_updaters/update-zlib.sh #ifndef SRC_ZLIB_VERSION_H_ #define SRC_ZLIB_VERSION_H_ -#define ZLIB_VERSION "1.3.1-63d7e16" +#define ZLIB_VERSION "1.3.1-e00f703" #endif // SRC_ZLIB_VERSION_H_