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

Side by Side Diff: net/third_party/nss/ssl.gyp

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « net/ssl/ssl_connection_status_flags_unittest.cc ('k') | net/third_party/nss/ssl/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) 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 'conditions': [ 6 'conditions': [
7 [ 'os_posix == 1 and OS != "mac" and OS != "ios"', { 7 [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
8 'conditions': [ 8 'conditions': [
9 ['sysroot!=""', { 9 ['sysroot!=""', {
10 'variables': { 10 'variables': {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 'sources!': [ 72 'sources!': [
73 'ssl/os2_err.c', 73 'ssl/os2_err.c',
74 'ssl/os2_err.h', 74 'ssl/os2_err.h',
75 ], 75 ],
76 'defines': [ 76 'defines': [
77 'NO_PKCS11_BYPASS', 77 'NO_PKCS11_BYPASS',
78 'NSS_ENABLE_ECC', 78 'NSS_ENABLE_ECC',
79 'USE_UTIL_DIRECTLY', 79 'USE_UTIL_DIRECTLY',
80 ], 80 ],
81 'msvs_disabled_warnings': [4018, 4244, 4267], 81 'msvs_disabled_warnings': [4018, 4244, 4267],
82 'variables': {
83 'clang_warning_flags_unset': [
84 # ssl uses PR_ASSERT(!"foo") instead of PR_ASSERT(false && "foo")
85 '-Wstring-conversion',
86 ],
87 },
82 'conditions': [ 88 'conditions': [
83 ['component == "shared_library"', { 89 ['component == "shared_library"', {
84 'conditions': [ 90 'conditions': [
85 ['OS == "mac" or OS == "ios"', { 91 ['OS == "mac" or OS == "ios"', {
86 'xcode_settings': { 92 'xcode_settings': {
87 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', 93 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
88 }, 94 },
89 }], 95 }],
90 ['OS == "win"', { 96 ['OS == "win"', {
91 'sources': [ 97 'sources': [
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 'configurations': { 192 'configurations': {
187 'Debug_Base': { 193 'Debug_Base': {
188 'defines': [ 194 'defines': [
189 'DEBUG', 195 'DEBUG',
190 ], 196 ],
191 }, 197 },
192 }, 198 },
193 }, 199 },
194 ], 200 ],
195 } 201 }
OLDNEW
« no previous file with comments | « net/ssl/ssl_connection_status_flags_unittest.cc ('k') | net/third_party/nss/ssl/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698