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

Side by Side Diff: crypto/crypto.gyp

Issue 492963004: Combine MSVS warning supression codes together in crypto.gyp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: incorporated the review comments Created 6 years, 4 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
« no previous file with comments | « AUTHORS ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'crypto.gypi', 10 'crypto.gypi',
11 ], 11 ],
12 'targets': [ 12 'targets': [
13 { 13 {
14 'target_name': 'crypto', 14 'target_name': 'crypto',
15 'type': '<(component)', 15 'type': '<(component)',
16 'product_name': 'crcrypto', # Avoid colliding with OpenSSL's libcrypto 16 'product_name': 'crcrypto', # Avoid colliding with OpenSSL's libcrypto
17 'dependencies': [ 17 'dependencies': [
18 '../base/base.gyp:base', 18 '../base/base.gyp:base',
19 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 19 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
20 ], 20 ],
21 'defines': [ 21 'defines': [
22 'CRYPTO_IMPLEMENTATION', 22 'CRYPTO_IMPLEMENTATION',
23 ], 23 ],
24 'msvs_disabled_warnings': [
25 4018,
26 ],
27 'conditions': [ 24 'conditions': [
28 [ 'os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { 25 [ 'os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
29 'dependencies': [ 26 'dependencies': [
30 '../build/linux/system.gyp:ssl', 27 '../build/linux/system.gyp:ssl',
31 ], 28 ],
32 'export_dependent_settings': [ 29 'export_dependent_settings': [
33 '../build/linux/system.gyp:ssl', 30 '../build/linux/system.gyp:ssl',
34 ], 31 ],
35 'conditions': [ 32 'conditions': [
36 [ 'chromeos==1', { 33 [ 'chromeos==1', {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 '../third_party/nss/nss.gyp:nss', 85 '../third_party/nss/nss.gyp:nss',
89 ], 86 ],
90 }], 87 }],
91 [ 'OS != "win"', { 88 [ 'OS != "win"', {
92 'sources!': [ 89 'sources!': [
93 'capi_util.h', 90 'capi_util.h',
94 'capi_util.cc', 91 'capi_util.cc',
95 ], 92 ],
96 }], 93 }],
97 [ 'OS == "win"', { 94 [ 'OS == "win"', {
98 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 95 'msvs_disabled_warnings': [
99 'msvs_disabled_warnings': [4267, ], 96 4267, # TODO(jschuh): crbug.com/167187 fix size_t to int tru ncations.
vivekg 2014/08/22 09:14:08 nit: Use single whitespace for the comment "4267,
97 4018,
98 ],
100 }], 99 }],
101 [ 'use_openssl==1', { 100 [ 'use_openssl==1', {
102 'dependencies': [ 101 'dependencies': [
103 '../third_party/boringssl/boringssl.gyp:boringssl', 102 '../third_party/boringssl/boringssl.gyp:boringssl',
104 ], 103 ],
105 # TODO(joth): Use a glob to match exclude patterns once the 104 # TODO(joth): Use a glob to match exclude patterns once the
106 # OpenSSL file set is complete. 105 # OpenSSL file set is complete.
107 'sources!': [ 106 'sources!': [
108 'ec_private_key_nss.cc', 107 'ec_private_key_nss.cc',
109 'ec_signature_creator_nss.cc', 108 'ec_signature_creator_nss.cc',
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 ]}, { # use_nss==0 292 ]}, { # use_nss==0
294 'targets': [ 293 'targets': [
295 { 294 {
296 'target_name': 'crypto_test_support', 295 'target_name': 'crypto_test_support',
297 'type': 'none', 296 'type': 'none',
298 'sources': [], 297 'sources': [],
299 } 298 }
300 ]}], 299 ]}],
301 ], 300 ],
302 } 301 }
OLDNEW
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698