Commit d40bde4a authored by Jamie Madill's avatar Jamie Madill Committed by Commit Bot

[zlib] Update zlib headers in GN

This will ensure changes to the headers force rebuilds of each
zlib source set target. This was picked up by a tool in ANGLE
(i.e. scripts/export_targets.py).

Bug: 1032721
Change-Id: Id64d02e1a11faefce2a88fb740e9bf1db32763dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2383291
Commit-Queue: Adenilson Cavalcanti <cavalcantii@chromium.org>
Reviewed-by: default avatarAdenilson Cavalcanti <cavalcantii@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803698}
parent 6a80d6a3
...@@ -29,6 +29,20 @@ config("zlib_internal_config") { ...@@ -29,6 +29,20 @@ config("zlib_internal_config") {
} }
} }
source_set("zlib_common_headers") {
sources = [
"chromeconf.h",
"deflate.h",
"inffast.h",
"inffixed.h",
"inflate.h",
"inftrees.h",
"zconf.h",
"zlib.h",
"zutil.h",
]
}
use_arm_neon_optimizations = false use_arm_neon_optimizations = false
if ((current_cpu == "arm" || current_cpu == "arm64") && if ((current_cpu == "arm" || current_cpu == "arm64") &&
!(is_win && !is_clang)) { !(is_win && !is_clang)) {
...@@ -81,6 +95,8 @@ source_set("zlib_adler32_simd") { ...@@ -81,6 +95,8 @@ source_set("zlib_adler32_simd") {
configs += [ ":zlib_internal_config" ] configs += [ ":zlib_internal_config" ]
public_configs = [ ":zlib_adler32_simd_config" ] public_configs = [ ":zlib_adler32_simd_config" ]
public_deps = [ ":zlib_common_headers" ]
} }
if (use_arm_neon_optimizations) { if (use_arm_neon_optimizations) {
...@@ -127,6 +143,8 @@ if (use_arm_neon_optimizations) { ...@@ -127,6 +143,8 @@ if (use_arm_neon_optimizations) {
configs += [ ":zlib_internal_config" ] configs += [ ":zlib_internal_config" ]
public_configs = [ ":zlib_arm_crc32_config" ] public_configs = [ ":zlib_arm_crc32_config" ]
public_deps = [ ":zlib_common_headers" ]
} }
} }
...@@ -170,6 +188,8 @@ source_set("zlib_inflate_chunk_simd") { ...@@ -170,6 +188,8 @@ source_set("zlib_inflate_chunk_simd") {
configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ]
public_configs = [ ":zlib_inflate_chunk_simd_config" ] public_configs = [ ":zlib_inflate_chunk_simd_config" ]
public_deps = [ ":zlib_common_headers" ]
} }
config("zlib_crc32_simd_config") { config("zlib_crc32_simd_config") {
...@@ -198,6 +218,7 @@ source_set("zlib_crc32_simd") { ...@@ -198,6 +218,7 @@ source_set("zlib_crc32_simd") {
configs += [ ":zlib_internal_config" ] configs += [ ":zlib_internal_config" ]
public_configs = [ ":zlib_crc32_simd_config" ] public_configs = [ ":zlib_crc32_simd_config" ]
public_deps = [ ":zlib_common_headers" ]
} }
config("zlib_x86_simd_config") { config("zlib_x86_simd_config") {
...@@ -229,6 +250,8 @@ source_set("zlib_x86_simd") { ...@@ -229,6 +250,8 @@ source_set("zlib_x86_simd") {
configs += [ ":zlib_internal_config" ] configs += [ ":zlib_internal_config" ]
public_configs = [ ":zlib_x86_simd_config" ] public_configs = [ ":zlib_x86_simd_config" ]
public_deps = [ ":zlib_common_headers" ]
} }
config("zlib_warnings") { config("zlib_warnings") {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment