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

Side by Side Diff: chrome/chrome.gyp

Issue 115420: Reland this change. Registers paths for the testing exe, too.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 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 | « chrome/app/chrome_dll_main.cc ('k') | chrome/common/chrome_paths.h » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 # Mac NOTE: at the start of the conditions block we default some vars 8 # Mac NOTE: at the start of the conditions block we default some vars
9 # that control features based on the branding, this way each place that 9 # that control features based on the branding, this way each place that
10 # needs to know about the feature isn't hard coded to the branding type. 10 # needs to know about the feature isn't hard coded to the branding type.
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 '../third_party/icu38/icu38.gyp:icuuc', 167 '../third_party/icu38/icu38.gyp:icuuc',
168 ], 168 ],
169 'include_dirs': [ 169 'include_dirs': [
170 '..', 170 '..',
171 'third_party/wtl/include', 171 'third_party/wtl/include',
172 ], 172 ],
173 'sources': [ 173 'sources': [
174 # All .cc, .h, and .mm files under app/ except for tests. 174 # All .cc, .h, and .mm files under app/ except for tests.
175 '../app/animation.cc', 175 '../app/animation.cc',
176 '../app/animation.h', 176 '../app/animation.h',
177 '../app/app_paths.h',
178 '../app/app_paths.cc',
177 '../app/app_switches.h', 179 '../app/app_switches.h',
178 '../app/app_switches.cc', 180 '../app/app_switches.cc',
179 '../app/drag_drop_types.cc', 181 '../app/drag_drop_types.cc',
180 '../app/drag_drop_types.h', 182 '../app/drag_drop_types.h',
181 '../app/gfx/canvas.cc', 183 '../app/gfx/canvas.cc',
182 '../app/gfx/canvas.h', 184 '../app/gfx/canvas.h',
183 '../app/gfx/canvas_linux.cc', 185 '../app/gfx/canvas_linux.cc',
184 '../app/gfx/canvas_win.cc', 186 '../app/gfx/canvas_win.cc',
185 '../app/gfx/font.h', 187 '../app/gfx/font.h',
186 '../app/gfx/font_gtk.cc', 188 '../app/gfx/font_gtk.cc',
(...skipping 3408 matching lines...) Expand 10 before | Expand all | Expand 10 after
3595 # Use outputs of this action as inputs for the main target build. 3597 # Use outputs of this action as inputs for the main target build.
3596 # Seems as a misnomer but makes this happy on Linux (scons). 3598 # Seems as a misnomer but makes this happy on Linux (scons).
3597 'process_outputs_as_sources': 1, 3599 'process_outputs_as_sources': 1,
3598 }, 3600 },
3599 ], # 'actions' 3601 ], # 'actions'
3600 }, 3602 },
3601 ] 3603 ]
3602 }], 3604 }],
3603 ], # 'conditions' 3605 ], # 'conditions'
3604 } 3606 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_dll_main.cc ('k') | chrome/common/chrome_paths.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698