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

Side by Side Diff: ash/ash.gyp

Issue 470523005: Move startup_helper_win.cc to separate target for incremental build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: restore exe behavior for sandbox Created 6 years, 4 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 | chrome/chrome_exe.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 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 'test/test_system_tray_delegate.cc', 708 'test/test_system_tray_delegate.cc',
709 'test/test_system_tray_delegate.h', 709 'test/test_system_tray_delegate.h',
710 'test/test_user_wallpaper_delegate.cc', 710 'test/test_user_wallpaper_delegate.cc',
711 'test/test_user_wallpaper_delegate.h', 711 'test/test_user_wallpaper_delegate.h',
712 'test/test_volume_control_delegate.cc', 712 'test/test_volume_control_delegate.cc',
713 'test/test_volume_control_delegate.h', 713 'test/test_volume_control_delegate.h',
714 'test/ui_controls_factory_ash.cc', 714 'test/ui_controls_factory_ash.cc',
715 'test/ui_controls_factory_ash.h', 715 'test/ui_controls_factory_ash.h',
716 ], 716 ],
717 'ash_shell_lib_sources': [ 717 'ash_shell_lib_sources': [
718 '../content/app/startup_helper_win.cc',
719 '../ui/views/test/test_views_delegate_aura.cc', 718 '../ui/views/test/test_views_delegate_aura.cc',
720 'shell/app_list.cc', 719 'shell/app_list.cc',
721 'shell/bubble.cc', 720 'shell/bubble.cc',
722 'shell/content_client/shell_browser_main_parts.cc', 721 'shell/content_client/shell_browser_main_parts.cc',
723 'shell/content_client/shell_browser_main_parts.h', 722 'shell/content_client/shell_browser_main_parts.h',
724 'shell/content_client/shell_content_browser_client.cc', 723 'shell/content_client/shell_content_browser_client.cc',
725 'shell/content_client/shell_content_browser_client.h', 724 'shell/content_client/shell_content_browser_client.h',
726 'shell/content_client/shell_main_delegate.cc', 725 'shell/content_client/shell_main_delegate.cc',
727 'shell/content_client/shell_main_delegate.h', 726 'shell/content_client/shell_main_delegate.h',
728 'shell/context_menu.cc', 727 'shell/context_menu.cc',
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
1192 '../ui/views/views.gyp:views_test_support', 1191 '../ui/views/views.gyp:views_test_support',
1193 'ash', 1192 'ash',
1194 'ash_resources.gyp:ash_resources', 1193 'ash_resources.gyp:ash_resources',
1195 'ash_strings.gyp:ash_strings', 1194 'ash_strings.gyp:ash_strings',
1196 'ash_test_support', 1195 'ash_test_support',
1197 'ash_with_content', 1196 'ash_with_content',
1198 ], 1197 ],
1199 'sources': [ 1198 'sources': [
1200 '<@(ash_shell_lib_sources)', 1199 '<@(ash_shell_lib_sources)',
1201 ], 1200 ],
1201 'conditions': [
1202 ['OS=="win"', {
1203 'dependencies': [
1204 '../content/content.gyp:content_startup_helper_win',
1205 ],
1206 }],
1207 ],
1202 }, 1208 },
1203 { 1209 {
1204 # GN version: //ash:ash_shell 1210 # GN version: //ash:ash_shell
1205 'target_name': 'ash_shell', 1211 'target_name': 'ash_shell',
1206 'type': 'executable', 1212 'type': 'executable',
1207 'dependencies': [ 1213 'dependencies': [
1208 'ash_shell_lib', 1214 'ash_shell_lib',
1209 '../components/components.gyp:user_manager', 1215 '../components/components.gyp:user_manager',
1210 ], 1216 ],
1211 'sources': [ 1217 'sources': [
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
1251 'conditions': [ 1257 'conditions': [
1252 ['chromeos==1', { 1258 ['chromeos==1', {
1253 'dependencies': [ 1259 'dependencies': [
1254 '../ui/display/display.gyp:display', 1260 '../ui/display/display.gyp:display',
1255 ], 1261 ],
1256 }], 1262 }],
1257 ], 1263 ],
1258 }, 1264 },
1259 ], 1265 ],
1260 } 1266 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698