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

Side by Side Diff: ash/ash.gyp

Issue 406483002: Revert of GN fixes for the Windows build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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') | chrome/chrome_browser_extensions.gypi » ('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 898 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 'defines': [ 909 'defines': [
910 'ASH_IMPLEMENTATION', 910 'ASH_IMPLEMENTATION',
911 ], 911 ],
912 'sources': [ 912 'sources': [
913 '<@(ash_sources)', 913 '<@(ash_sources)',
914 ], 914 ],
915 'conditions': [ 915 'conditions': [
916 ['OS=="win"', { 916 ['OS=="win"', {
917 'sources!': [ 917 'sources!': [
918 # Note: sources list duplicated in GN build. 918 # Note: sources list duplicated in GN build.
919 "host/window_tree_host_factory.cc",
919 "sticky_keys/sticky_keys_controller.cc", 920 "sticky_keys/sticky_keys_controller.cc",
920 "sticky_keys/sticky_keys_controller.h", 921 "sticky_keys/sticky_keys_controller.h",
921 ], 922 ],
922 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 923 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
923 'msvs_disabled_warnings': [ 4267, ], 924 'msvs_disabled_warnings': [ 4267, ],
924 }], 925 }],
925 ['use_x11!=1', { 926 ['use_x11!=1', {
926 'sources!': [ 927 'sources!': [
927 # Note: sources list duplicated in GN build. 928 # Note: sources list duplicated in GN build.
928 'accelerators/key_hold_detector.cc', 929 'accelerators/key_hold_detector.cc',
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
1243 'conditions': [ 1244 'conditions': [
1244 ['chromeos==1', { 1245 ['chromeos==1', {
1245 'dependencies': [ 1246 'dependencies': [
1246 '../ui/display/display.gyp:display', 1247 '../ui/display/display.gyp:display',
1247 ], 1248 ],
1248 }], 1249 }],
1249 ], 1250 ],
1250 }, 1251 },
1251 ], 1252 ],
1252 } 1253 }
OLDNEW
« no previous file with comments | « ash/BUILD.gn ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698