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

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: combine 2 conditions into one in base.gyp Created 7 years 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') | chrome/installer/mini_installer/chrome.release » ('J')
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 774 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 'message_loop/message_pump_glib_unittest.cc', 785 'message_loop/message_pump_glib_unittest.cc',
786 ] 786 ]
787 }], 787 }],
788 ['OS == "linux" and linux_use_tcmalloc==1', { 788 ['OS == "linux" and linux_use_tcmalloc==1', {
789 'dependencies': [ 789 'dependencies': [
790 'allocator/allocator.gyp:allocator', 790 'allocator/allocator.gyp:allocator',
791 ], 791 ],
792 }, 792 },
793 ], 793 ],
794 ['OS == "win"', { 794 ['OS == "win"', {
795 # This is needed to trigger the dll copy step on windows.
796 # TODO(mark): This should not be necessary.
797 'dependencies': [
798 '../third_party/icu/icu.gyp:icudata',
799 ],
800 'sources!': [ 795 'sources!': [
801 'file_descriptor_shuffle_unittest.cc', 796 'file_descriptor_shuffle_unittest.cc',
802 'files/dir_reader_posix_unittest.cc', 797 'files/dir_reader_posix_unittest.cc',
803 'threading/worker_pool_posix_unittest.cc', 798 'threading/worker_pool_posix_unittest.cc',
804 'message_loop/message_pump_libevent_unittest.cc', 799 'message_loop/message_pump_libevent_unittest.cc',
805 ], 800 ],
806 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 801 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
807 'msvs_disabled_warnings': [ 802 'msvs_disabled_warnings': [
808 4267, 803 4267,
809 ], 804 ],
810 # This is needed so base_unittests uses the allocator shim, as
811 # SecurityTest.MemoryAllocationRestriction* tests are dependent
812 # on tcmalloc.
813 # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into
814 # their own test suite.
815 'conditions': [ 805 'conditions': [
806 # This is needed so base_unittests uses the allocator shim, as
807 # SecurityTest.MemoryAllocationRestriction* tests are dependent
808 # on tcmalloc.
809 # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into
810 # their own test suite.
816 ['win_use_allocator_shim==1', { 811 ['win_use_allocator_shim==1', {
817 'dependencies': [ 812 'dependencies': [
818 'allocator/allocator.gyp:allocator', 813 'allocator/allocator.gyp:allocator',
819 ], 814 ],
820 }], 815 }],
816 ['icu_use_data_file_flag==0', {
817 # This is needed to trigger the dll copy step on windows.
818 # TODO(mark): This should not be necessary.
819 'dependencies': [
820 '../third_party/icu/icu.gyp:icudata',
821 ],
822 }],
821 ], 823 ],
822 }, { # OS != "win" 824 }, { # OS != "win"
823 'dependencies': [ 825 'dependencies': [
824 '../third_party/libevent/libevent.gyp:libevent' 826 '../third_party/libevent/libevent.gyp:libevent'
825 ], 827 ],
826 'sources/': [ 828 'sources/': [
827 ['exclude', '^win/'], 829 ['exclude', '^win/'],
828 ], 830 ],
829 'sources!': [ 831 'sources!': [
830 'win/win_util_unittest.cc', 832 'win/win_util_unittest.cc',
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
1389 'base_unittests.isolate', 1391 'base_unittests.isolate',
1390 ], 1392 ],
1391 'sources': [ 1393 'sources': [
1392 'base_unittests.isolate', 1394 'base_unittests.isolate',
1393 ], 1395 ],
1394 }, 1396 },
1395 ], 1397 ],
1396 }], 1398 }],
1397 ], 1399 ],
1398 } 1400 }
OLDNEW
« no previous file with comments | « no previous file | base/i18n/icu_util.cc » ('j') | chrome/installer/mini_installer/chrome.release » ('J')

Powered by Google App Engine
This is Rietveld 408576698