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

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

Issue 11275240: Update net/third_party/nss/ssl to NSS 3.14. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Upload before commit Created 8 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 | Annotate | Revision Log
« no previous file with comments | « net/third_party/nss/patches/versionskew.patch ('k') | net/third_party/nss/ssl/Makefile » ('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': {
11 'pkg-config': '../../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"', 11 'pkg-config': '../../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
12 }, 12 },
13 }, { 13 }, {
14 'variables': { 14 'variables': {
15 'pkg-config': 'pkg-config' 15 'pkg-config': 'pkg-config'
16 }, 16 },
17 }], 17 }],
18 ], 18 ],
19 }], 19 }],
20 ], 20 ],
21 21
22 'targets': [ 22 'targets': [
23 { 23 {
24 'target_name': 'libssl', 24 'target_name': 'libssl',
25 'type': 'static_library', 25 'type': 'static_library',
26 'sources': [ 26 'sources': [
27 'ssl/authcert.c', 27 'ssl/authcert.c',
28 'ssl/cmpcert.c', 28 'ssl/cmpcert.c',
29 'ssl/derive.c', 29 'ssl/derive.c',
30 'ssl/dtls1con.c', 30 'ssl/dtlscon.c',
31 'ssl/nsskea.c',
32 'ssl/os2_err.c', 31 'ssl/os2_err.c',
33 'ssl/os2_err.h', 32 'ssl/os2_err.h',
34 'ssl/preenc.h', 33 'ssl/preenc.h',
35 'ssl/prelib.c', 34 'ssl/prelib.c',
36 'ssl/ssl.h', 35 'ssl/ssl.h',
37 'ssl/ssl3con.c', 36 'ssl/ssl3con.c',
38 'ssl/ssl3ecc.c', 37 'ssl/ssl3ecc.c',
39 'ssl/ssl3ext.c', 38 'ssl/ssl3ext.c',
40 'ssl/ssl3gthr.c', 39 'ssl/ssl3gthr.c',
41 'ssl/ssl3prot.h', 40 'ssl/ssl3prot.h',
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 'configurations': { 171 'configurations': {
173 'Debug_Base': { 172 'Debug_Base': {
174 'defines': [ 173 'defines': [
175 'DEBUG', 174 'DEBUG',
176 ], 175 ],
177 }, 176 },
178 }, 177 },
179 }, 178 },
180 ], 179 ],
181 } 180 }
OLDNEW
« no previous file with comments | « net/third_party/nss/patches/versionskew.patch ('k') | net/third_party/nss/ssl/Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698