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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 18470007: Swtich guard from aura to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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 | « no previous file | no next file » | 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 'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html', 7 'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html',
8 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], 8 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
9 }, 9 },
10 'targets': [ 10 'targets': [
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 ['OS != "ios"', { 347 ['OS != "ios"', {
348 'dependencies': [ 348 'dependencies': [
349 # TODO(zork): Protect this with if use_aura==1 349 # TODO(zork): Protect this with if use_aura==1
350 '<(DEPTH)/ash/ash_strings.gyp:ash_strings', 350 '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
351 '<(DEPTH)/content/content_resources.gyp:content_resources', 351 '<(DEPTH)/content/content_resources.gyp:content_resources',
352 '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:device_bluetooth_st rings', 352 '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:device_bluetooth_st rings',
353 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', 353 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
354 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings', 354 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
355 ], 355 ],
356 }], 356 }],
357 ['use_aura==1 and use_ash==0', {
rjkroege 2013/07/15 21:53:32 this probably needs a comment.
Peter Mayo 2013/07/15 22:11:02 Done.
358 'dependencies': [
359 '<(DEPTH)/ash/ash.gyp:ash_resources',
360 ],
361 }],
357 ['use_ash==1', { 362 ['use_ash==1', {
358 'dependencies': [ 363 'dependencies': [
359 '<(DEPTH)/ash/ash.gyp:ash_resources', 364 '<(DEPTH)/ash/ash.gyp:ash_resources',
360 '<(DEPTH)/ash/ash.gyp:ash_wallpaper_resources', 365 '<(DEPTH)/ash/ash.gyp:ash_wallpaper_resources',
361 ], 366 ],
362 }], 367 }],
363 ['OS != "mac" and OS != "ios"', { 368 ['OS != "mac" and OS != "ios"', {
364 # Copy pak files to the product directory. These files will be picked 369 # Copy pak files to the product directory. These files will be picked
365 # up by the following installer scripts: 370 # up by the following installer scripts:
366 # - Windows: chrome/installer/mini_installer/chrome.release 371 # - Windows: chrome/installer/mini_installer/chrome.release
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 '<(generator_path)', 479 '<(generator_path)',
475 'credits', 480 'credits',
476 '<(about_credits_file)', 481 '<(about_credits_file)',
477 ], 482 ],
478 'message': 'Generating about:credits.', 483 'message': 'Generating about:credits.',
479 }, 484 },
480 ], 485 ],
481 }, 486 },
482 ], # targets 487 ], # targets
483 } 488 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698