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

Side by Side Diff: third_party/zlib/BUILD.gn

Issue 1415753003: gn format everything. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert freetype-android change Created 5 years, 1 month 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
« no previous file with comments | « third_party/mojo/src/mojo/public/cpp/utility/BUILD.gn ('k') | ui/resources/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 && (current_cpu == "x86" || current_cpu == "x64")) { 10 if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
(...skipping 11 matching lines...) Expand all
22 sources = [ 22 sources = [
23 "simd_stub.c", 23 "simd_stub.c",
24 ] 24 ]
25 } 25 }
26 26
27 configs -= [ "//build/config/compiler:chromium_code" ] 27 configs -= [ "//build/config/compiler:chromium_code" ]
28 configs += [ "//build/config/compiler:no_chromium_code" ] 28 configs += [ "//build/config/compiler:no_chromium_code" ]
29 } 29 }
30 30
31 config("zlib_warnings") { 31 config("zlib_warnings") {
32 if (is_clang && !is_ios && 32 if (is_clang && !is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
33 (current_cpu == "x86" || current_cpu == "x64")) {
34 cflags = [ "-Wno-incompatible-pointer-types" ] 33 cflags = [ "-Wno-incompatible-pointer-types" ]
35 } 34 }
36 } 35 }
37 36
38 static_library("zlib") { 37 static_library("zlib") {
39 if (!is_win) { 38 if (!is_win) {
40 # Don't stomp on "libzlib" on other platforms. 39 # Don't stomp on "libzlib" on other platforms.
41 output_name = "chrome_zlib" 40 output_name = "chrome_zlib"
42 } 41 }
43 42
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 "google/zip_internal.cc", 142 "google/zip_internal.cc",
144 "google/zip_internal.h", 143 "google/zip_internal.h",
145 "google/zip_reader.cc", 144 "google/zip_reader.cc",
146 "google/zip_reader.h", 145 "google/zip_reader.h",
147 ] 146 ]
148 deps = [ 147 deps = [
149 ":minizip", 148 ":minizip",
150 "//base", 149 "//base",
151 ] 150 ]
152 } 151 }
OLDNEW
« no previous file with comments | « third_party/mojo/src/mojo/public/cpp/utility/BUILD.gn ('k') | ui/resources/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698