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

Side by Side Diff: base/base.gyp

Issue 1062743005: GN Windows build fixes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wintests
Patch Set: merge 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 | « BUILD.gn ('k') | base/threading/thread_local_storage_unittest.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 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 'allocator/allocator.gyp:allocator', 796 'allocator/allocator.gyp:allocator',
797 ], 797 ],
798 }], 798 }],
799 ['icu_use_data_file_flag==0', { 799 ['icu_use_data_file_flag==0', {
800 # This is needed to trigger the dll copy step on windows. 800 # This is needed to trigger the dll copy step on windows.
801 # TODO(mark): This should not be necessary. 801 # TODO(mark): This should not be necessary.
802 'dependencies': [ 802 'dependencies': [
803 '../third_party/icu/icu.gyp:icudata', 803 '../third_party/icu/icu.gyp:icudata',
804 ], 804 ],
805 }], 805 }],
806 ['incremental_chrome_dll', {
807 'defines': [
808 # Used only to workaround a linker bug, do not use this
809 # otherwise, and don't make it broader scope. See
810 # http://crbug.com/251251.
811 'INCREMENTAL_LINKING',
812 ],
813 }],
814 ], 806 ],
815 }, { # OS != "win" 807 }, { # OS != "win"
816 'dependencies': [ 808 'dependencies': [
817 '../third_party/libevent/libevent.gyp:libevent' 809 '../third_party/libevent/libevent.gyp:libevent'
818 ], 810 ],
819 }], 811 }],
820 ], # conditions 812 ], # conditions
821 'target_conditions': [ 813 'target_conditions': [
822 ['OS == "ios" and _toolset != "host"', { 814 ['OS == "ios" and _toolset != "host"', {
823 'sources/': [ 815 'sources/': [
(...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after
1623 'dependencies': [ 1615 'dependencies': [
1624 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1616 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1625 ], 1617 ],
1626 }], 1618 }],
1627 ], 1619 ],
1628 }, 1620 },
1629 ], 1621 ],
1630 }], 1622 }],
1631 ], 1623 ],
1632 } 1624 }
OLDNEW
« no previous file with comments | « BUILD.gn ('k') | base/threading/thread_local_storage_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698