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

Side by Side Diff: net/net.gyp

Issue 172031: Update gyp files and DEPS for icu42 (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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 | « net/base/net_util_unittest.cc ('k') | printing/printing.gyp » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'includes': [ 9 'includes': [
10 '../build/common.gypi', 10 '../build/common.gypi',
11 ], 11 ],
12 'targets': [ 12 'targets': [
13 { 13 {
14 'target_name': 'net', 14 'target_name': 'net',
15 'type': '<(library)', 15 'type': '<(library)',
16 'dependencies': [ 16 'dependencies': [
17 '../base/base.gyp:base', 17 '../base/base.gyp:base',
18 '../build/temp_gyp/googleurl.gyp:googleurl', 18 '../build/temp_gyp/googleurl.gyp:googleurl',
19 '../sdch/sdch.gyp:sdch', 19 '../sdch/sdch.gyp:sdch',
20 '../third_party/bzip2/bzip2.gyp:bzip2', 20 '../third_party/bzip2/bzip2.gyp:bzip2',
21 '../third_party/icu38/icu38.gyp:icui18n', 21 '../third_party/icu/icu.gyp:icui18n',
22 '../third_party/icu38/icu38.gyp:icuuc', 22 '../third_party/icu/icu.gyp:icuuc',
23 '../third_party/modp_b64/modp_b64.gyp:modp_b64', 23 '../third_party/modp_b64/modp_b64.gyp:modp_b64',
24 '../third_party/zlib/zlib.gyp:zlib', 24 '../third_party/zlib/zlib.gyp:zlib',
25 'net_resources', 25 'net_resources',
26 ], 26 ],
27 'msvs_guid': '326E9795-E760-410A-B69A-3F79DB3F5243', 27 'msvs_guid': '326E9795-E760-410A-B69A-3F79DB3F5243',
28 'sources': [ 28 'sources': [
29 'base/address_list.cc', 29 'base/address_list.cc',
30 'base/address_list.h', 30 'base/address_list.h',
31 'base/auth.h', 31 'base/auth.h',
32 'base/base64.cc', 32 'base/base64.cc',
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 'base/nss_memio.c', 406 'base/nss_memio.c',
407 'base/nss_memio.h', 407 'base/nss_memio.h',
408 'base/x509_certificate_nss.cc', 408 'base/x509_certificate_nss.cc',
409 'ocsp/nss_ocsp.cc', 409 'ocsp/nss_ocsp.cc',
410 'ocsp/nss_ocsp.h', 410 'ocsp/nss_ocsp.h',
411 'socket/ssl_client_socket_nss.cc', 411 'socket/ssl_client_socket_nss.cc',
412 'socket/ssl_client_socket_nss.h', 412 'socket/ssl_client_socket_nss.h',
413 ], 413 ],
414 # Get U_STATIC_IMPLEMENTATION and -I directories on Linux. 414 # Get U_STATIC_IMPLEMENTATION and -I directories on Linux.
415 'dependencies': [ 415 'dependencies': [
416 '../third_party/icu38/icu38.gyp:icui18n', 416 '../third_party/icu/icu.gyp:icui18n',
417 '../third_party/icu38/icu38.gyp:icuuc', 417 '../third_party/icu/icu.gyp:icuuc',
418 ], 418 ],
419 }, 419 },
420 ], 420 ],
421 [ 'OS == "mac"', { 421 [ 'OS == "mac"', {
422 'sources/': [ ['exclude', '_(linux|win)\\.cc$'] ], 422 'sources/': [ ['exclude', '_(linux|win)\\.cc$'] ],
423 'link_settings': { 423 'link_settings': {
424 'libraries': [ 424 'libraries': [
425 '$(SDKROOT)/System/Library/Frameworks/Security.framework', 425 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
426 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork', 426 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork',
427 ] 427 ]
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 }, 546 },
547 ], 547 ],
548 [ 'OS == "mac"', { 548 [ 'OS == "mac"', {
549 'sources/': [ ['exclude', '_(linux|win)_unittest\\.cc$'] ], 549 'sources/': [ ['exclude', '_(linux|win)_unittest\\.cc$'] ],
550 }, 550 },
551 ], 551 ],
552 # This is needed to trigger the dll copy step on windows. 552 # This is needed to trigger the dll copy step on windows.
553 # TODO(mark): Specifying this here shouldn't be necessary. 553 # TODO(mark): Specifying this here shouldn't be necessary.
554 [ 'OS == "win"', { 554 [ 'OS == "win"', {
555 'dependencies': [ 555 'dependencies': [
556 '../third_party/icu38/icu38.gyp:icudata', 556 '../third_party/icu/icu.gyp:icudata',
557 ], 557 ],
558 }, 558 },
559 ], 559 ],
560 ], 560 ],
561 }, 561 },
562 { 562 {
563 'target_name': 'net_perftests', 563 'target_name': 'net_perftests',
564 'type': 'executable', 564 'type': 'executable',
565 'dependencies': [ 565 'dependencies': [
566 'net', 566 'net',
567 'net_test_support', 567 'net_test_support',
568 '../base/base.gyp:base', 568 '../base/base.gyp:base',
569 '../base/base.gyp:test_support_base', 569 '../base/base.gyp:test_support_base',
570 '../base/base.gyp:test_support_perf', 570 '../base/base.gyp:test_support_perf',
571 '../testing/gtest.gyp:gtest', 571 '../testing/gtest.gyp:gtest',
572 ], 572 ],
573 'msvs_guid': 'AAC78796-B9A2-4CD9-BF89-09B03E92BF73', 573 'msvs_guid': 'AAC78796-B9A2-4CD9-BF89-09B03E92BF73',
574 'sources': [ 574 'sources': [
575 'base/cookie_monster_perftest.cc', 575 'base/cookie_monster_perftest.cc',
576 'disk_cache/disk_cache_perftest.cc', 576 'disk_cache/disk_cache_perftest.cc',
577 'proxy/proxy_resolver_perftest.cc', 577 'proxy/proxy_resolver_perftest.cc',
578 ], 578 ],
579 'conditions': [ 579 'conditions': [
580 # This is needed to trigger the dll copy step on windows. 580 # This is needed to trigger the dll copy step on windows.
581 # TODO(mark): Specifying this here shouldn't be necessary. 581 # TODO(mark): Specifying this here shouldn't be necessary.
582 [ 'OS == "win"', { 582 [ 'OS == "win"', {
583 'dependencies': [ 583 'dependencies': [
584 '../third_party/icu38/icu38.gyp:icudata', 584 '../third_party/icu/icu.gyp:icudata',
585 ], 585 ],
586 }, 586 },
587 ], 587 ],
588 ], 588 ],
589 }, 589 },
590 { 590 {
591 'target_name': 'stress_cache', 591 'target_name': 'stress_cache',
592 'type': 'executable', 592 'type': 'executable',
593 'dependencies': [ 593 'dependencies': [
594 'net', 594 'net',
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 'tools/dump_cache/dump_cache.cc', 730 'tools/dump_cache/dump_cache.cc',
731 'tools/dump_cache/dump_files.cc', 731 'tools/dump_cache/dump_files.cc',
732 'tools/dump_cache/upgrade.cc', 732 'tools/dump_cache/upgrade.cc',
733 'tools/dump_cache/url_to_filename_encoder.h', 733 'tools/dump_cache/url_to_filename_encoder.h',
734 ], 734 ],
735 }, 735 },
736 ], 736 ],
737 }], 737 }],
738 ], 738 ],
739 } 739 }
OLDNEW
« no previous file with comments | « net/base/net_util_unittest.cc ('k') | printing/printing.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698