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

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

Issue 10386177: Roll NSS from 136057:137477 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pick up 137925 as well Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « DEPS ('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 'conditions': [ 6 'conditions': [
7 [ 'os_posix == 1 and OS != "mac"', { 7 [ 'os_posix == 1 and OS != "mac"', {
8 'conditions': [ 8 'conditions': [
9 ['sysroot!=""', { 9 ['sysroot!=""', {
10 'variables': { 10 'variables': {
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 'sources/': [ 135 'sources/': [
136 ['exclude', 'ssl/bodge/'], 136 ['exclude', 'ssl/bodge/'],
137 ], 137 ],
138 'defines': [ 138 'defines': [
139 'NSS_PLATFORM_CLIENT_AUTH', 139 'NSS_PLATFORM_CLIENT_AUTH',
140 ], 140 ],
141 'dependencies': [ 141 'dependencies': [
142 '../../../third_party/nss/nss.gyp:nspr', 142 '../../../third_party/nss/nss.gyp:nspr',
143 '../../../third_party/nss/nss.gyp:nss', 143 '../../../third_party/nss/nss.gyp:nss',
144 ], 144 ],
145 'export_dependent_settings': [
146 '../../../third_party/nss/nss.gyp:nspr',
147 '../../../third_party/nss/nss.gyp:nss',
148 ],
145 'direct_dependent_settings': { 149 'direct_dependent_settings': {
146 'include_dirs': [ 150 'include_dirs': [
147 'ssl', 151 'ssl',
148 ], 152 ],
149 'defines': [ 153 'defines': [
150 'NSS_PLATFORM_CLIENT_AUTH', 154 'NSS_PLATFORM_CLIENT_AUTH',
151 ], 155 ],
152 }, 156 },
153 }], 157 }],
154 ], 158 ],
155 'configurations': { 159 'configurations': {
156 'Debug_Base': { 160 'Debug_Base': {
157 'defines': [ 161 'defines': [
158 'DEBUG', 162 'DEBUG',
159 ], 163 ],
160 }, 164 },
161 }, 165 },
162 }, 166 },
163 ], 167 ],
164 } 168 }
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698