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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 9307037: Reland http://codereview.chromium.org/9121050/ with fix for aura_win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Separate ash_strings into its own gyp to break circular dependencies Created 8 years, 10 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/launcher/tabbed_launcher_button.cc ('k') | chrome/tools/build/repack_locales.py » ('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 'variables': { 5 'variables': {
6 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 6 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
7 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], 7 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 'variables': { 262 'variables': {
263 'repack_path': '../tools/grit/grit/format/repack.py', 263 'repack_path': '../tools/grit/grit/format/repack.py',
264 }, 264 },
265 'dependencies': [ 265 'dependencies': [
266 # MSVS needs the dependencies explictly named, Make is able to 266 # MSVS needs the dependencies explictly named, Make is able to
267 # derive the dependencies from the output files. 267 # derive the dependencies from the output files.
268 'chrome_resources', 268 'chrome_resources',
269 'chrome_strings', 269 'chrome_strings',
270 'platform_locale_settings', 270 'platform_locale_settings',
271 'theme_resources', 271 'theme_resources',
272 # TODO(zork): Protect this with if use_aura==1
273 '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
272 '<(DEPTH)/content/content_resources.gyp:content_resources', 274 '<(DEPTH)/content/content_resources.gyp:content_resources',
273 '<(DEPTH)/net/net.gyp:net_resources', 275 '<(DEPTH)/net/net.gyp:net_resources',
274 '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings', 276 '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
275 '<(DEPTH)/ui/ui.gyp:gfx_resources', 277 '<(DEPTH)/ui/ui.gyp:gfx_resources',
276 '<(DEPTH)/ui/ui.gyp:ui_resources', 278 '<(DEPTH)/ui/ui.gyp:ui_resources',
277 '<(DEPTH)/ui/ui.gyp:ui_resources_2x', 279 '<(DEPTH)/ui/ui.gyp:ui_resources_2x',
278 '<(DEPTH)/ui/ui.gyp:ui_resources_standard', 280 '<(DEPTH)/ui/ui.gyp:ui_resources_standard',
279 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', 281 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
280 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', 282 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
281 ], 283 ],
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 'files': ['<@(default_apps_list)'] 329 'files': ['<@(default_apps_list)']
328 }, 330 },
329 ], 331 ],
330 }], 332 }],
331 ], # conditions 333 ], # conditions
332 }], # end OS != "mac" 334 }], # end OS != "mac"
333 ], # conditions 335 ], # conditions
334 }, 336 },
335 ], # targets 337 ], # targets
336 } 338 }
OLDNEW
« no previous file with comments | « ash/launcher/tabbed_launcher_button.cc ('k') | chrome/tools/build/repack_locales.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698