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

Side by Side Diff: net/net.gyp

Issue 1085923002: Rename use_nss to use_nss_certs in gyp and grit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wrapping Created 5 years, 8 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
« no previous file with comments | « crypto/crypto.gyp ('k') | net/net_common.gypi » ('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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 'disk_cache/blockfile/index_table_v3_unittest.cc', 172 'disk_cache/blockfile/index_table_v3_unittest.cc',
173 # No res_ninit() et al on Android, so this doesn't make a lot of 173 # No res_ninit() et al on Android, so this doesn't make a lot of
174 # sense. 174 # sense.
175 'dns/dns_config_service_posix_unittest.cc', 175 'dns/dns_config_service_posix_unittest.cc',
176 ], 176 ],
177 'dependencies': [ 177 'dependencies': [
178 'net_javatests', 178 'net_javatests',
179 'net_test_jni_headers', 179 'net_test_jni_headers',
180 ], 180 ],
181 }], 181 }],
182 [ 'use_nss != 1', { 182 [ 'use_nss_certs != 1', {
183 'sources!': [ 183 'sources!': [
184 'ssl/client_cert_store_chromeos_unittest.cc', 184 'ssl/client_cert_store_chromeos_unittest.cc',
185 'ssl/client_cert_store_nss_unittest.cc', 185 'ssl/client_cert_store_nss_unittest.cc',
186 ], 186 ],
187 }], 187 }],
188 [ 'use_openssl == 1', { 188 [ 'use_openssl == 1', {
189 # Avoid compiling/linking with the system library. 189 # Avoid compiling/linking with the system library.
190 'dependencies': [ 190 'dependencies': [
191 '../third_party/boringssl/boringssl.gyp:boringssl', 191 '../third_party/boringssl/boringssl.gyp:boringssl',
192 ], 192 ],
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 'url_request/test_url_fetcher_factory.h', 600 'url_request/test_url_fetcher_factory.h',
601 'url_request/url_request_test_util.cc', 601 'url_request/url_request_test_util.cc',
602 'url_request/url_request_test_util.h', 602 'url_request/url_request_test_util.h',
603 ], 603 ],
604 'conditions': [ 604 'conditions': [
605 ['OS != "ios"', { 605 ['OS != "ios"', {
606 'dependencies': [ 606 'dependencies': [
607 '../third_party/protobuf/protobuf.gyp:py_proto', 607 '../third_party/protobuf/protobuf.gyp:py_proto',
608 ], 608 ],
609 }], 609 }],
610 ['use_openssl == 0 and (use_nss == 1 or OS == "ios")', { 610 ['use_openssl == 0 and (use_nss_certs == 1 or OS == "ios")', {
611 'conditions': [ 611 'conditions': [
612 [ 'desktop_linux == 1 or chromeos == 1', { 612 [ 'desktop_linux == 1 or chromeos == 1', {
613 'dependencies': [ 613 'dependencies': [
614 '../build/linux/system.gyp:ssl', 614 '../build/linux/system.gyp:ssl',
615 ], 615 ],
616 }, { # desktop_linux == 0 and chromeos == 0 616 }, { # desktop_linux == 0 and chromeos == 0
617 'dependencies': [ 617 'dependencies': [
618 '../third_party/nss/nss.gyp:nspr', 618 '../third_party/nss/nss.gyp:nspr',
619 '../third_party/nss/nss.gyp:nss', 619 '../third_party/nss/nss.gyp:nss',
620 'third_party/nss/ssl.gyp:libssl', 620 'third_party/nss/ssl.gyp:libssl',
(...skipping 23 matching lines...) Expand all
644 'net_with_v8', 644 'net_with_v8',
645 ], 645 ],
646 }, 646 },
647 ], 647 ],
648 [ 'enable_mdns != 1', { 648 [ 'enable_mdns != 1', {
649 'sources!' : [ 649 'sources!' : [
650 'dns/mock_mdns_socket_factory.cc', 650 'dns/mock_mdns_socket_factory.cc',
651 'dns/mock_mdns_socket_factory.h' 651 'dns/mock_mdns_socket_factory.h'
652 ] 652 ]
653 }], 653 }],
654 [ 'use_nss != 1', { 654 [ 'use_nss_certs != 1', {
655 'sources!': [ 655 'sources!': [
656 'test/cert_test_util_nss.cc', 656 'test/cert_test_util_nss.cc',
657 ], 657 ],
658 }], 658 }],
659 ['disable_file_support != 1', { 659 ['disable_file_support != 1', {
660 'sources': [ 660 'sources': [
661 'test/url_request/url_request_mock_http_job.cc', 661 'test/url_request/url_request_mock_http_job.cc',
662 'test/url_request/url_request_mock_http_job.h', 662 'test/url_request/url_request_mock_http_job.h',
663 'url_request/test_url_request_interceptor.cc', 663 'url_request/test_url_request_interceptor.cc',
664 'url_request/test_url_request_interceptor.h', 664 'url_request/test_url_request_interceptor.h',
(...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after
1536 '../build/isolate.gypi', 1536 '../build/isolate.gypi',
1537 ], 1537 ],
1538 'sources': [ 1538 'sources': [
1539 'net_unittests.isolate', 1539 'net_unittests.isolate',
1540 ], 1540 ],
1541 }, 1541 },
1542 ], 1542 ],
1543 }], 1543 }],
1544 ], 1544 ],
1545 } 1545 }
OLDNEW
« no previous file with comments | « crypto/crypto.gyp ('k') | net/net_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698