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

Side by Side Diff: ash/ash.gyp

Issue 400233002: GN Windows build fixes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ipc Created 6 years, 5 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 | « ash/BUILD.gn ('k') | components/storage_monitor/BUILD.gn » ('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 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 # These files lists are shared with the GN build. 9 # These files lists are shared with the GN build.
10 'ash_sources': [ 10 'ash_sources': [
(...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 'defines': [ 911 'defines': [
912 'ASH_IMPLEMENTATION', 912 'ASH_IMPLEMENTATION',
913 ], 913 ],
914 'sources': [ 914 'sources': [
915 '<@(ash_sources)', 915 '<@(ash_sources)',
916 ], 916 ],
917 'conditions': [ 917 'conditions': [
918 ['OS=="win"', { 918 ['OS=="win"', {
919 'sources!': [ 919 'sources!': [
920 # Note: sources list duplicated in GN build. 920 # Note: sources list duplicated in GN build.
921 "host/window_tree_host_factory.cc",
922 "sticky_keys/sticky_keys_controller.cc", 921 "sticky_keys/sticky_keys_controller.cc",
923 "sticky_keys/sticky_keys_controller.h", 922 "sticky_keys/sticky_keys_controller.h",
924 ], 923 ],
925 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 924 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
926 'msvs_disabled_warnings': [ 4267, ], 925 'msvs_disabled_warnings': [ 4267, ],
927 }], 926 }],
928 ['use_x11!=1', { 927 ['use_x11!=1', {
929 'sources!': [ 928 'sources!': [
930 # Note: sources list duplicated in GN build. 929 # Note: sources list duplicated in GN build.
931 'accelerators/key_hold_detector.cc', 930 'accelerators/key_hold_detector.cc',
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
1246 'conditions': [ 1245 'conditions': [
1247 ['chromeos==1', { 1246 ['chromeos==1', {
1248 'dependencies': [ 1247 'dependencies': [
1249 '../ui/display/display.gyp:display', 1248 '../ui/display/display.gyp:display',
1250 ], 1249 ],
1251 }], 1250 }],
1252 ], 1251 ],
1253 }, 1252 },
1254 ], 1253 ],
1255 } 1254 }
OLDNEW
« no previous file with comments | « ash/BUILD.gn ('k') | components/storage_monitor/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698