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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 461773002: Do not build device/bluetooth strings when extensions are disabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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 'omnibox_mojom_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/om nibox/omnibox.mojom.js', 9 'omnibox_mojom_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/om nibox/omnibox.mojom.js',
10 }, 10 },
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 }, 436 },
437 { 437 {
438 'includes': ['chrome_repack_chrome_200_percent.gypi'] 438 'includes': ['chrome_repack_chrome_200_percent.gypi']
439 }, 439 },
440 ], 440 ],
441 'conditions': [ 441 'conditions': [
442 ['OS != "ios"', { 442 ['OS != "ios"', {
443 'dependencies': [ 443 'dependencies': [
444 '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings', 444 '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
445 '<(DEPTH)/content/content_resources.gyp:content_resources', 445 '<(DEPTH)/content/content_resources.gyp:content_resources',
446 '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:device_bluetooth_st rings',
447 '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings',
448 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resour ces', 446 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resour ces',
449 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', 447 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
450 ], 448 ],
451 }], 449 }],
452 ['use_ash==1', { 450 ['use_ash==1', {
453 'dependencies': [ 451 'dependencies': [
454 '<(DEPTH)/ash/ash_resources.gyp:ash_resources', 452 '<(DEPTH)/ash/ash_resources.gyp:ash_resources',
455 '<(DEPTH)/ash/ash_strings.gyp:ash_strings', 453 '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
456 ], 454 ],
457 }], 455 }],
458 ['chromeos==1', { 456 ['chromeos==1', {
459 'dependencies': [ 457 'dependencies': [
460 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', 458 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
461 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', 459 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
462 ], 460 ],
463 }], 461 }],
464 ['enable_autofill_dialog==1 and OS!="android"', { 462 ['enable_autofill_dialog==1 and OS!="android"', {
465 'dependencies': [ 463 'dependencies': [
466 '<(DEPTH)/third_party/libaddressinput/libaddressinput.gyp:libaddress input_strings', 464 '<(DEPTH)/third_party/libaddressinput/libaddressinput.gyp:libaddress input_strings',
467 ], 465 ],
468 }], 466 }],
467 ['enable_extensions==1', {
468 'dependencies': [
469 '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:device_bluetooth_st rings',
470 '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings',
471 ],
472 }],
469 ['OS != "mac" and OS != "ios"', { 473 ['OS != "mac" and OS != "ios"', {
470 # Copy pak files to the product directory. These files will be picked 474 # Copy pak files to the product directory. These files will be picked
471 # up by the following installer scripts: 475 # up by the following installer scripts:
472 # - Windows: chrome/installer/mini_installer/chrome.release 476 # - Windows: chrome/installer/mini_installer/chrome.release
473 # - Linux: chrome/installer/linux/internal/common/installer.include 477 # - Linux: chrome/installer/linux/internal/common/installer.include
474 # Ensure that the above scripts are updated when adding or removing 478 # Ensure that the above scripts are updated when adding or removing
475 # pak files. 479 # pak files.
476 # Copying files to the product directory is not needed on the Mac 480 # Copying files to the product directory is not needed on the Mac
477 # since the framework build phase will copy them into the framework 481 # since the framework build phase will copy them into the framework
478 # bundle directly. 482 # bundle directly.
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 '<(generator_path)', 565 '<(generator_path)',
562 'credits', 566 'credits',
563 '<(about_credits_file)', 567 '<(about_credits_file)',
564 ], 568 ],
565 'message': 'Generating about:credits', 569 'message': 'Generating about:credits',
566 }, 570 },
567 ], 571 ],
568 }, 572 },
569 ], # targets 573 ], # targets
570 } 574 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698