Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 config("zlib_config") { 5 config("zlib_config") {
6 include_dirs = [ "." ] 6 include_dirs = [ "." ]
7 } 7 }
8 8
9 static_library("zlib_x86_simd") { 9 static_library("zlib_x86_simd") {
10 if (!is_ios && (cpu_arch == "x86" || cpu_arch == "x64")) { 10 if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
11 sources = [ 11 sources = [
12 "crc_folding.c", 12 "crc_folding.c",
13 "fill_window_sse.c", 13 "fill_window_sse.c",
14 ] 14 ]
15 if (!is_win || is_clang) { 15 if (!is_win || is_clang) {
16 cflags = [ 16 cflags = [
17 "-msse4.2", 17 "-msse4.2",
18 "-mpclmul", 18 "-mpclmul",
19 ] 19 ]
20 } 20 }
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 "trees.c", 58 "trees.c",
59 "trees.h", 59 "trees.h",
60 "uncompr.c", 60 "uncompr.c",
61 "x86.h", 61 "x86.h",
62 "zconf.h", 62 "zconf.h",
63 "zlib.h", 63 "zlib.h",
64 "zutil.c", 64 "zutil.c",
65 "zutil.h", 65 "zutil.h",
66 ] 66 ]
67 67
68 if (!is_ios && (cpu_arch == "x86" || cpu_arch == "x64")) { 68 if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
69 sources += [ "x86.c" ] 69 sources += [ "x86.c" ]
70 } 70 }
71 71
72 configs -= [ "//build/config/compiler:chromium_code" ] 72 configs -= [ "//build/config/compiler:chromium_code" ]
73 configs += [ "//build/config/compiler:no_chromium_code" ] 73 configs += [ "//build/config/compiler:no_chromium_code" ]
74 74
75 public_configs = [ ":zlib_config" ] 75 public_configs = [ ":zlib_config" ]
76 deps = [ 76 deps = [
77 ":zlib_x86_simd", 77 ":zlib_x86_simd",
78 ] 78 ]
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 "google/zip_internal.cc", 123 "google/zip_internal.cc",
124 "google/zip_internal.h", 124 "google/zip_internal.h",
125 "google/zip_reader.cc", 125 "google/zip_reader.cc",
126 "google/zip_reader.h", 126 "google/zip_reader.h",
127 ] 127 ]
128 deps = [ 128 deps = [
129 ":minizip", 129 ":minizip",
130 "//base", 130 "//base",
131 ] 131 ]
132 } 132 }
OLDNEW
« third_party/widevine/cdm/BUILD.gn ('K') | « third_party/yasm/yasm_assemble.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698