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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 136793004: Only include ash_strings if use_ash==1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed the comparison Created 6 years, 11 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/chrome_repack_pseudo_locales.gypi ('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 'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html', 7 'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html',
8 'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i nternal/additional_modules_list.txt', 8 'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i nternal/additional_modules_list.txt',
9 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], 9 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
10 }, 10 },
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 { 375 {
376 'includes': ['chrome_repack_chrome_200_percent.gypi'] 376 'includes': ['chrome_repack_chrome_200_percent.gypi']
377 }, 377 },
378 { 378 {
379 'includes': ['chrome_repack_chrome_touch_100_percent.gypi'] 379 'includes': ['chrome_repack_chrome_touch_100_percent.gypi']
380 }, 380 },
381 ], 381 ],
382 'conditions': [ 382 'conditions': [
383 ['OS != "ios"', { 383 ['OS != "ios"', {
384 'dependencies': [ 384 'dependencies': [
385 # TODO(zork): Protect this with if use_aura==1
386 '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
387 '<(DEPTH)/content/content_resources.gyp:content_resources', 385 '<(DEPTH)/content/content_resources.gyp:content_resources',
388 '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:device_bluetooth_st rings', 386 '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:device_bluetooth_st rings',
389 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', 387 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
390 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings', 388 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
391 ], 389 ],
392 }], 390 }],
393 ['use_ash==1', { 391 ['use_ash==1', {
394 'dependencies': [ 392 'dependencies': [
393 '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
395 '<(DEPTH)/ash/ash.gyp:ash_resources', 394 '<(DEPTH)/ash/ash.gyp:ash_resources',
396 ], 395 ],
397 }], 396 }],
398 ['OS != "mac" and OS != "ios"', { 397 ['OS != "mac" and OS != "ios"', {
399 # Copy pak files to the product directory. These files will be picked 398 # Copy pak files to the product directory. These files will be picked
400 # up by the following installer scripts: 399 # up by the following installer scripts:
401 # - Windows: chrome/installer/mini_installer/chrome.release 400 # - Windows: chrome/installer/mini_installer/chrome.release
402 # - Linux: chrome/installer/linux/internal/common/installer.include 401 # - Linux: chrome/installer/linux/internal/common/installer.include
403 # Ensure that the above scripts are updated when adding or removing 402 # Ensure that the above scripts are updated when adding or removing
404 # pak files. 403 # pak files.
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 '<(generator_path)', 500 '<(generator_path)',
502 'credits', 501 'credits',
503 '<(about_credits_file)', 502 '<(about_credits_file)',
504 ], 503 ],
505 'message': 'Generating about:credits', 504 'message': 'Generating about:credits',
506 }, 505 },
507 ], 506 ],
508 }, 507 },
509 ], # targets 508 ], # targets
510 } 509 }
OLDNEW
« no previous file with comments | « chrome/chrome_repack_pseudo_locales.gypi ('k') | chrome/tools/build/repack_locales.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698