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

Side by Side Diff: base/base.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 | « app/app.gyp ('k') | base/icu_util.cc » ('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': 'base', 14 'target_name': 'base',
15 'type': '<(library)', 15 'type': '<(library)',
16 'dependencies': [ 16 'dependencies': [
17 '../third_party/icu38/icu38.gyp:icui18n', 17 '../third_party/icu/icu.gyp:icui18n',
18 '../third_party/icu38/icu38.gyp:icuuc', 18 '../third_party/icu/icu.gyp:icuuc',
19 ], 19 ],
20 'msvs_guid': '1832A374-8A74-4F9E-B536-69A699B3E165', 20 'msvs_guid': '1832A374-8A74-4F9E-B536-69A699B3E165',
21 'sources': [ 21 'sources': [
22 '../build/build_config.h', 22 '../build/build_config.h',
23 'crypto/cssm_init.cc', 23 'crypto/cssm_init.cc',
24 'crypto/cssm_init.h', 24 'crypto/cssm_init.h',
25 'crypto/rsa_private_key.h', 25 'crypto/rsa_private_key.h',
26 'crypto/rsa_private_key_win.cc', 26 'crypto/rsa_private_key_win.cc',
27 'crypto/signature_creator.h', 27 'crypto/signature_creator.h',
28 'crypto/signature_creator_win.cc', 28 'crypto/signature_creator_win.cc',
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 'watchdog_unittest.cc', 660 'watchdog_unittest.cc',
661 'weak_ptr_unittest.cc', 661 'weak_ptr_unittest.cc',
662 'win_util_unittest.cc', 662 'win_util_unittest.cc',
663 'wmi_util_unittest.cc', 663 'wmi_util_unittest.cc',
664 'word_iterator_unittest.cc', 664 'word_iterator_unittest.cc',
665 'worker_pool_unittest.cc', 665 'worker_pool_unittest.cc',
666 ], 666 ],
667 'include_dirs': [ 667 'include_dirs': [
668 # word_iterator.h (used by word_iterator_unittest.cc) leaks an ICU 668 # word_iterator.h (used by word_iterator_unittest.cc) leaks an ICU
669 # #include for unicode/uchar.h. This should probably be cleaned up. 669 # #include for unicode/uchar.h. This should probably be cleaned up.
670 '../third_party/icu38/public/common', 670 '../third_party/icu/public/common',
671 ], 671 ],
672 'dependencies': [ 672 'dependencies': [
673 'base', 673 'base',
674 'base_gfx', 674 'base_gfx',
675 '../skia/skia.gyp:skia', 675 '../skia/skia.gyp:skia',
676 '../testing/gmock.gyp:gmock', 676 '../testing/gmock.gyp:gmock',
677 '../testing/gtest.gyp:gtest', 677 '../testing/gtest.gyp:gtest',
678 ], 678 ],
679 'conditions': [ 679 'conditions': [
680 ['OS == "linux" or OS == "freebsd"', { 680 ['OS == "linux" or OS == "freebsd"', {
(...skipping 15 matching lines...) Expand all
696 }], 696 }],
697 ['OS != "mac"', { 697 ['OS != "mac"', {
698 'sources!': [ 698 'sources!': [
699 'mac_util_unittest.cc', 699 'mac_util_unittest.cc',
700 ], 700 ],
701 }], 701 }],
702 # This is needed to trigger the dll copy step on windows. 702 # This is needed to trigger the dll copy step on windows.
703 # TODO(mark): This should not be necessary. 703 # TODO(mark): This should not be necessary.
704 ['OS == "win"', { 704 ['OS == "win"', {
705 'dependencies': [ 705 'dependencies': [
706 '../third_party/icu38/icu38.gyp:icudata', 706 '../third_party/icu/icu.gyp:icudata',
707 ], 707 ],
708 'sources!': [ 708 'sources!': [
709 'data_pack_unittest.cc', 709 'data_pack_unittest.cc',
710 'file_descriptor_shuffle_unittest.cc', 710 'file_descriptor_shuffle_unittest.cc',
711 ], 711 ],
712 }, { # OS != "win" 712 }, { # OS != "win"
713 'sources!': [ 713 'sources!': [
714 'crypto/rsa_private_key_unittest.cc', 714 'crypto/rsa_private_key_unittest.cc',
715 'crypto/signature_creator_unittest.cc', 715 'crypto/signature_creator_unittest.cc',
716 'gfx/native_theme_unittest.cc', 716 'gfx/native_theme_unittest.cc',
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 '<@(_outputs)', 863 '<@(_outputs)',
864 ], 864 ],
865 'message': 'Generating version information', 865 'message': 'Generating version information',
866 }, 866 },
867 ], 867 ],
868 }, 868 },
869 ], 869 ],
870 }], 870 }],
871 ], 871 ],
872 } 872 }
OLDNEW
« no previous file with comments | « app/app.gyp ('k') | base/icu_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698