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

Side by Side Diff: runtime/bin/net/ssl.gyp

Issue 11365165: Change names of all NSS gyp targets, so they don't conflict with the Chromium target names. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: 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
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 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 5 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
6 # for details. All rights reserved. Use of this source code is governed by a 6 # for details. All rights reserved. Use of this source code is governed by a
7 # BSD-style license that can be found in the LICENSE file. 7 # BSD-style license that can be found in the LICENSE file.
8 8
9 # This file is a modified copy of Chromium's src/net/third_party/nss/ssl.gyp. 9 # This file is a modified copy of Chromium's src/net/third_party/nss/ssl.gyp.
10 # Revision 165464 (this should agree with "nss_rev" in DEPS). 10 # Revision 165464 (this should agree with "nss_rev" in DEPS).
(...skipping 10 matching lines...) Expand all
21 '../../tools/gyp/runtime-configurations.gypi', 21 '../../tools/gyp/runtime-configurations.gypi',
22 '../../tools/gyp/nss_configurations.gypi', 22 '../../tools/gyp/nss_configurations.gypi',
23 ], 23 ],
24 # Added by Dart. 24 # Added by Dart.
25 'variables': { 25 'variables': {
26 'ssl_directory': '../../../third_party/net_nss', 26 'ssl_directory': '../../../third_party/net_nss',
27 'os_posix': 0, 27 'os_posix': 0,
28 }, 28 },
29 'targets': [ 29 'targets': [
30 { 30 {
31 'target_name': 'libssl', 31 'target_name': 'libssl_dart',
32 'type': 'static_library', 32 'type': 'static_library',
33 # Changed by Dart: '<(ssl_directory)/' added to all paths. 33 # Changed by Dart: '<(ssl_directory)/' added to all paths.
34 'sources': [ 34 'sources': [
35 '<(ssl_directory)/ssl/authcert.c', 35 '<(ssl_directory)/ssl/authcert.c',
36 '<(ssl_directory)/ssl/cmpcert.c', 36 '<(ssl_directory)/ssl/cmpcert.c',
37 '<(ssl_directory)/ssl/derive.c', 37 '<(ssl_directory)/ssl/derive.c',
38 '<(ssl_directory)/ssl/dtls1con.c', 38 '<(ssl_directory)/ssl/dtls1con.c',
39 '<(ssl_directory)/ssl/nsskea.c', 39 '<(ssl_directory)/ssl/nsskea.c',
40 '<(ssl_directory)/ssl/os2_err.c', 40 '<(ssl_directory)/ssl/os2_err.c',
41 '<(ssl_directory)/ssl/os2_err.h', 41 '<(ssl_directory)/ssl/os2_err.h',
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 'defines': [ 83 'defines': [
84 'NSS_ENABLE_ECC', 84 'NSS_ENABLE_ECC',
85 'NSS_ENABLE_ZLIB', 85 'NSS_ENABLE_ZLIB',
86 'USE_UTIL_DIRECTLY', 86 'USE_UTIL_DIRECTLY',
87 ], 87 ],
88 'defines!': [ 88 'defines!': [
89 # Regrettably, NSS can't be compiled with NO_NSPR_10_SUPPORT yet. 89 # Regrettably, NSS can't be compiled with NO_NSPR_10_SUPPORT yet.
90 'NO_NSPR_10_SUPPORT', 90 'NO_NSPR_10_SUPPORT',
91 ], 91 ],
92 'dependencies': [ 92 'dependencies': [
93 'zlib.gyp:zlib', 93 'zlib.gyp:zlib_dart',
94 # Dart: Start of copy of code from 'bodge' conditions section below. 94 # Dart: Start of copy of code from 'bodge' conditions section below.
95 'nss.gyp:nspr', 95 'nss.gyp:nspr_dart',
96 'nss.gyp:nss', 96 'nss.gyp:nss_dart',
97 ], 97 ],
98 'export_dependent_settings': [ 98 'export_dependent_settings': [
99 'nss.gyp:nspr', 99 'nss.gyp:nspr_dart',
100 'nss.gyp:nss', 100 'nss.gyp:nss_dart',
101 ], 101 ],
102 'direct_dependent_settings': { 102 'direct_dependent_settings': {
103 'include_dirs': [ 103 'include_dirs': [
104 '<(ssl_directory)/ssl', 104 '<(ssl_directory)/ssl',
105 ], 105 ],
106 'defines': [ 106 'defines': [
107 'NSS_PLATFORM_CLIENT_AUTH', 107 'NSS_PLATFORM_CLIENT_AUTH',
108 ], 108 ],
109 # Dart: End of copy of code from bodge conditions section. 109 # Dart: End of copy of code from bodge conditions section.
110 }, 110 },
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 'configurations': { 156 'configurations': {
157 'Debug_Base': { 157 'Debug_Base': {
158 'defines': [ 158 'defines': [
159 'DEBUG', 159 'DEBUG',
160 ], 160 ],
161 }, 161 },
162 }, 162 },
163 }, 163 },
164 ], 164 ],
165 } 165 }
OLDNEW
« runtime/bin/bin.gypi ('K') | « runtime/bin/net/sqlite.gyp ('k') | runtime/bin/net/zlib.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698