third_party/zlib/BUILD.gn - Issue 913373002: Update Chomium's build files to work w/ latest GN binaries.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/zlib/BUILD.gn

Issue 913373002: Update Chomium's build files to work w/ latest GN binaries. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn_cpu_arch_changes

Patch Set: merge to #317214 Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: third_party/zlib/BUILD.gn

diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn

index e49b5e97fc03cbbda7d7589cb2f134a966f3624d..1cea9acb9835b079bf3e9f7e34eb3fa773b63af3 100644

--- a/third_party/zlib/BUILD.gn

+++ b/third_party/zlib/BUILD.gn

@@ -7,7 +7,7 @@ config("zlib_config") {

}

static_library("zlib_x86_simd") {

- if (!is_ios && (cpu_arch == "x86" || cpu_arch == "x64")) {

+ if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) {

sources = [

"crc_folding.c",

"fill_window_sse.c",

@@ -65,7 +65,7 @@ static_library("zlib") {

"zutil.h",

]

- if (!is_ios && (cpu_arch == "x86" || cpu_arch == "x64")) {

+ if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) {

sources += [ "x86.c" ]

}

« third_party/widevine/cdm/BUILD.gn ('K') | « third_party/yasm/yasm_assemble.gni ('k') | no next file » | no next file with comments »