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

Side by Side Diff: base/base.gyp

Issue 99473012: Enable icu_use_data_file on Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: load icudtl.dat in DIR_MODULE instead of DIR_EXE on WIndows Created 6 years, 11 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 | « no previous file | base/i18n/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) 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 'message_loop/message_pump_glib_unittest.cc', 754 'message_loop/message_pump_glib_unittest.cc',
755 ] 755 ]
756 }], 756 }],
757 ['OS == "linux" and linux_use_tcmalloc==1', { 757 ['OS == "linux" and linux_use_tcmalloc==1', {
758 'dependencies': [ 758 'dependencies': [
759 'allocator/allocator.gyp:allocator', 759 'allocator/allocator.gyp:allocator',
760 ], 760 ],
761 }, 761 },
762 ], 762 ],
763 ['OS == "win"', { 763 ['OS == "win"', {
764 # This is needed to trigger the dll copy step on windows.
765 # TODO(mark): This should not be necessary.
766 'dependencies': [
767 '../third_party/icu/icu.gyp:icudata',
768 ],
769 'sources!': [ 764 'sources!': [
770 'file_descriptor_shuffle_unittest.cc', 765 'file_descriptor_shuffle_unittest.cc',
771 'files/dir_reader_posix_unittest.cc', 766 'files/dir_reader_posix_unittest.cc',
772 'threading/worker_pool_posix_unittest.cc', 767 'threading/worker_pool_posix_unittest.cc',
773 'message_loop/message_pump_libevent_unittest.cc', 768 'message_loop/message_pump_libevent_unittest.cc',
774 ], 769 ],
775 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 770 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
776 'msvs_disabled_warnings': [ 771 'msvs_disabled_warnings': [
777 4267, 772 4267,
778 ], 773 ],
779 # This is needed so base_unittests uses the allocator shim, as
780 # SecurityTest.MemoryAllocationRestriction* tests are dependent
781 # on tcmalloc.
782 # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into
783 # their own test suite.
784 'conditions': [ 774 'conditions': [
775 # This is needed so base_unittests uses the allocator shim, as
776 # SecurityTest.MemoryAllocationRestriction* tests are dependent
777 # on tcmalloc.
778 # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into
779 # their own test suite.
785 ['win_use_allocator_shim==1', { 780 ['win_use_allocator_shim==1', {
786 'dependencies': [ 781 'dependencies': [
787 'allocator/allocator.gyp:allocator', 782 'allocator/allocator.gyp:allocator',
788 ], 783 ],
789 }], 784 }],
785 ['icu_use_data_file_flag==0', {
786 # This is needed to trigger the dll copy step on windows.
787 # TODO(mark): This should not be necessary.
788 'dependencies': [
789 '../third_party/icu/icu.gyp:icudata',
790 ],
791 }],
790 ], 792 ],
791 }, { # OS != "win" 793 }, { # OS != "win"
792 'dependencies': [ 794 'dependencies': [
793 '../third_party/libevent/libevent.gyp:libevent' 795 '../third_party/libevent/libevent.gyp:libevent'
794 ], 796 ],
795 }], 797 }],
796 ['use_aura==1 and use_x11==1', { 798 ['use_aura==1 and use_x11==1', {
797 'sources': [ 799 'sources': [
798 'x11/edid_parser_x11_unittest.cc', 800 'x11/edid_parser_x11_unittest.cc',
799 ], 801 ],
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
1409 'base_unittests.isolate', 1411 'base_unittests.isolate',
1410 ], 1412 ],
1411 'sources': [ 1413 'sources': [
1412 'base_unittests.isolate', 1414 'base_unittests.isolate',
1413 ], 1415 ],
1414 }, 1416 },
1415 ], 1417 ],
1416 }], 1418 }],
1417 ], 1419 ],
1418 } 1420 }
OLDNEW
« no previous file with comments | « no previous file | base/i18n/icu_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698