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

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

Issue 1226583002: clang/win: Build chromium code without -Wno-incompatible-pointer-types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@clang-logical-op-parentheses
Patch Set: rebase Created 5 years, 5 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 && (current_cpu == "x86" || current_cpu == "x64")) { 10 if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 && (current_cpu == "x86" || current_cpu == "x64")) { 68 if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
69 sources += [ "x86.c" ] 69 sources += [ "x86.c" ]
70
71 config("zlib_warnings") {
72 if (is_clang) {
73 cflags = [ "-Wno-incompatible-pointer-types" ]
74 }
75 }
76 configs += [ ":zlib_warnings" ]
70 } 77 }
71 78
72 configs -= [ "//build/config/compiler:chromium_code" ] 79 configs -= [ "//build/config/compiler:chromium_code" ]
73 configs += [ "//build/config/compiler:no_chromium_code" ] 80 configs += [ "//build/config/compiler:no_chromium_code" ]
74 81
75 public_configs = [ ":zlib_config" ] 82 public_configs = [ ":zlib_config" ]
76 deps = [ 83 deps = [
77 ":zlib_x86_simd", 84 ":zlib_x86_simd",
78 ] 85 ]
79 } 86 }
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 "google/zip_internal.cc", 133 "google/zip_internal.cc",
127 "google/zip_internal.h", 134 "google/zip_internal.h",
128 "google/zip_reader.cc", 135 "google/zip_reader.cc",
129 "google/zip_reader.h", 136 "google/zip_reader.h",
130 ] 137 ]
131 deps = [ 138 deps = [
132 ":minizip", 139 ":minizip",
133 "//base", 140 "//base",
134 ] 141 ]
135 } 142 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698