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

Side by Side Diff: crypto/BUILD.gn

Issue 643703008: Adding openssl_bio_string to GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | 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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 import("//build/config/crypto.gni") 5 import("//build/config/crypto.gni")
6 6
7 component("crypto") { 7 component("crypto") {
8 output_name = "crcrypto" # Avoid colliding with OpenSSL's libcrypto. 8 output_name = "crcrypto" # Avoid colliding with OpenSSL's libcrypto.
9 sources = [ 9 sources = [
10 "apple_keychain.h", 10 "apple_keychain.h",
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 "mac_security_services_lock.h", 42 "mac_security_services_lock.h",
43 # TODO(brettw) these mocks should be moved to a test_support_crypto target 43 # TODO(brettw) these mocks should be moved to a test_support_crypto target
44 # if possible. 44 # if possible.
45 "mock_apple_keychain.cc", 45 "mock_apple_keychain.cc",
46 "mock_apple_keychain.h", 46 "mock_apple_keychain.h",
47 "mock_apple_keychain_ios.cc", 47 "mock_apple_keychain_ios.cc",
48 "mock_apple_keychain_mac.cc", 48 "mock_apple_keychain_mac.cc",
49 "nss_util.cc", 49 "nss_util.cc",
50 "nss_util.h", 50 "nss_util.h",
51 "nss_util_internal.h", 51 "nss_util_internal.h",
52 "openssl_bio_string.cc",
53 "openssl_bio_string.h",
wtc 2014/10/24 23:43:19 Just FYP: these two files were added in https://co
pwestin(chromium) 2014/10/24 23:51:18 Acknowledged.
52 "openssl_util.cc", 54 "openssl_util.cc",
53 "openssl_util.h", 55 "openssl_util.h",
54 "p224.cc", 56 "p224.cc",
55 "p224.h", 57 "p224.h",
56 "p224_spake.cc", 58 "p224_spake.cc",
57 "p224_spake.h", 59 "p224_spake.h",
58 "random.cc", 60 "random.cc",
59 "random.h", 61 "random.h",
60 "rsa_private_key.cc", 62 "rsa_private_key.cc",
61 "rsa_private_key.h", 63 "rsa_private_key.h",
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 "third_party/nss/pk11akey.cc", 145 "third_party/nss/pk11akey.cc",
144 "third_party/nss/rsawrapr.c", 146 "third_party/nss/rsawrapr.c",
145 "third_party/nss/secsign.cc", 147 "third_party/nss/secsign.cc",
146 ] 148 ]
147 } else { 149 } else {
148 # Remove OpenSSL when using NSS. 150 # Remove OpenSSL when using NSS.
149 sources -= [ 151 sources -= [
150 "ec_private_key_openssl.cc", 152 "ec_private_key_openssl.cc",
151 "ec_signature_creator_openssl.cc", 153 "ec_signature_creator_openssl.cc",
152 "encryptor_openssl.cc", 154 "encryptor_openssl.cc",
153 "hmac_openssl.cc", 155 "hmac_openssl.cc",
wtc 2014/10/24 23:43:19 IMPORTANT: Also add them here.
pwestin(chromium) 2014/10/24 23:51:18 Done.
154 "openssl_util.cc", 156 "openssl_util.cc",
155 "openssl_util.h", 157 "openssl_util.h",
156 "rsa_private_key_openssl.cc", 158 "rsa_private_key_openssl.cc",
157 "secure_hash_openssl.cc", 159 "secure_hash_openssl.cc",
158 "signature_creator_openssl.cc", 160 "signature_creator_openssl.cc",
159 "signature_verifier_openssl.cc", 161 "signature_verifier_openssl.cc",
160 "symmetric_key_openssl.cc", 162 "symmetric_key_openssl.cc",
161 ] 163 ]
162 } 164 }
163 165
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 test("crypto_unittests") { 199 test("crypto_unittests") {
198 sources = [ 200 sources = [
199 # Tests. 201 # Tests.
200 "curve25519_unittest.cc", 202 "curve25519_unittest.cc",
201 "ec_private_key_unittest.cc", 203 "ec_private_key_unittest.cc",
202 "ec_signature_creator_unittest.cc", 204 "ec_signature_creator_unittest.cc",
203 "encryptor_unittest.cc", 205 "encryptor_unittest.cc",
204 "ghash_unittest.cc", 206 "ghash_unittest.cc",
205 "hkdf_unittest.cc", 207 "hkdf_unittest.cc",
206 "hmac_unittest.cc", 208 "hmac_unittest.cc",
207 "nss_util_unittest.cc", 209 "nss_util_unittest.cc",
wtc 2014/10/24 23:43:19 Add "openssl_bio_string_unittest.cc" here.
pwestin(chromium) 2014/10/24 23:51:18 Done.
208 "p224_unittest.cc", 210 "p224_unittest.cc",
209 "p224_spake_unittest.cc", 211 "p224_spake_unittest.cc",
210 "random_unittest.cc", 212 "random_unittest.cc",
211 "rsa_private_key_unittest.cc", 213 "rsa_private_key_unittest.cc",
212 "rsa_private_key_nss_unittest.cc", 214 "rsa_private_key_nss_unittest.cc",
213 "secure_hash_unittest.cc", 215 "secure_hash_unittest.cc",
214 "sha2_unittest.cc", 216 "sha2_unittest.cc",
215 "signature_creator_unittest.cc", 217 "signature_creator_unittest.cc",
216 "signature_verifier_unittest.cc", 218 "signature_verifier_unittest.cc",
217 "symmetric_key_unittest.cc", 219 "symmetric_key_unittest.cc",
218 ] 220 ]
219 221
220 if (use_openssl || !is_linux) { 222 if (use_openssl || !is_linux) {
221 sources -= [ 223 sources -= [
222 "rsa_private_key_nss_unittest.cc", 224 "rsa_private_key_nss_unittest.cc",
223 ] 225 ]
224 } 226 }
225 227
226 if (use_openssl) { 228 if (use_openssl) {
227 sources -= [ "nss_util_unittest.cc" ] 229 sources -= [ "nss_util_unittest.cc" ]
228 } 230 }
wtc 2014/10/24 23:43:19 Add: } else { sources -= [ "openssl_bio_str
pwestin(chromium) 2014/10/24 23:51:18 Done.
229 231
230 deps = [ 232 deps = [
231 ":crypto", 233 ":crypto",
232 ":platform", 234 ":platform",
233 ":test_support", 235 ":test_support",
234 "//base", 236 "//base",
235 "//base/test:run_all_unittests", 237 "//base/test:run_all_unittests",
236 "//base/test:test_support", 238 "//base/test:test_support",
237 "//testing/gmock", 239 "//testing/gmock",
238 "//testing/gtest", 240 "//testing/gtest",
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 ] 297 ]
296 } else { 298 } else {
297 # Non-Linux platforms use the hermetic NSS from the tree. 299 # Non-Linux platforms use the hermetic NSS from the tree.
298 deps += [ 300 deps += [
299 "//third_party/nss:nspr", 301 "//third_party/nss:nspr",
300 "//third_party/nss:nss", 302 "//third_party/nss:nss",
301 ] 303 ]
302 } 304 }
303 } 305 }
304 } 306 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698