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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 2001093002: Revert of Remove enable_topchrome_md build flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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 # Apply Chrome-specific grit settings to all of this file. 6 # Apply Chrome-specific grit settings to all of this file.
7 # The advantage is that one entry here applies to the entire file. 7 # The advantage is that one entry here applies to the entire file.
8 # The caveat is these variables cannot be merged with other variable 8 # The caveat is these variables cannot be merged with other variable
9 # dictionaries in more inner scopes. If the variable should be merged, 9 # dictionaries in more inner scopes. If the variable should be merged,
10 # consider putting them in a gypi file and including it at the right scope 10 # consider putting them in a gypi file and including it at the right scope
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 'pak_locales': '<(pseudo_locales)', 535 'pak_locales': '<(pseudo_locales)',
536 }, 536 },
537 'includes': ['chrome_repack_locales.gypi'] 537 'includes': ['chrome_repack_locales.gypi']
538 }, 538 },
539 { 539 {
540 'includes': ['chrome_repack_chrome_100_percent.gypi'] 540 'includes': ['chrome_repack_chrome_100_percent.gypi']
541 }, 541 },
542 { 542 {
543 'includes': ['chrome_repack_chrome_200_percent.gypi'] 543 'includes': ['chrome_repack_chrome_200_percent.gypi']
544 }, 544 },
545 {
546 'includes': ['chrome_repack_chrome_material_100_percent.gypi']
547 },
548 {
549 'includes': ['chrome_repack_chrome_material_200_percent.gypi']
550 },
545 ], 551 ],
546 'conditions': [ # GN version: chrome_repack_locales.gni template("_repack _one_locale") 552 'conditions': [ # GN version: chrome_repack_locales.gni template("_repack _one_locale")
547 ['OS != "ios"', { 553 ['OS != "ios"', {
548 'dependencies': [ # Update duplicate logic in repack_locales.py 554 'dependencies': [ # Update duplicate logic in repack_locales.py
549 '<(DEPTH)/content/app/resources/content_resources.gyp:content_resour ces', 555 '<(DEPTH)/content/app/resources/content_resources.gyp:content_resour ces',
550 '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings', 556 '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
551 '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:bluetooth_strings', 557 '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:bluetooth_strings',
552 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resour ces', 558 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resour ces',
553 ], 559 ],
554 }, { # else 560 }, { # else
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 ['enable_extensions==1', { 594 ['enable_extensions==1', {
589 'dependencies': [ # Update duplicate logic in repack_locales.py 595 'dependencies': [ # Update duplicate logic in repack_locales.py
590 '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings', 596 '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings',
591 ], 597 ],
592 }], 598 }],
593 ['enable_app_list==1', { 599 ['enable_app_list==1', {
594 'dependencies': [ 600 'dependencies': [
595 '<(DEPTH)/ui/app_list/resources/app_list_resources.gyp:app_list_res ources', 601 '<(DEPTH)/ui/app_list/resources/app_list_resources.gyp:app_list_res ources',
596 ], 602 ],
597 }], 603 }],
598 ['OS == "mac"', {
599 'actions': [
600 {
601 'includes': ['chrome_repack_chrome_material_100_percent.gypi']
602 },
603 {
604 'includes': ['chrome_repack_chrome_material_200_percent.gypi']
605 },
606 ],
607 }],
608 ['OS != "mac" and OS != "ios"', { 604 ['OS != "mac" and OS != "ios"', {
609 # Copy pak files to the product directory. These files will be picked 605 # Copy pak files to the product directory. These files will be picked
610 # up by the following installer scripts: 606 # up by the following installer scripts:
611 # - Windows: chrome/installer/mini_installer/chrome.release 607 # - Windows: chrome/installer/mini_installer/chrome.release
612 # - Linux: chrome/installer/linux/internal/common/installer.include 608 # - Linux: chrome/installer/linux/internal/common/installer.include
613 # Ensure that the above scripts are updated when adding or removing 609 # Ensure that the above scripts are updated when adding or removing
614 # pak files. 610 # pak files.
615 # Copying files to the product directory is not needed on the Mac 611 # Copying files to the product directory is not needed on the Mac
616 # since the framework build phase will copy them into the framework 612 # since the framework build phase will copy them into the framework
617 # bundle directly. 613 # bundle directly.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 ['enable_hidpi == 1', { 648 ['enable_hidpi == 1', {
653 'copies': [ 649 'copies': [
654 { 650 {
655 'destination': '<(PRODUCT_DIR)', 651 'destination': '<(PRODUCT_DIR)',
656 'files': [ 652 'files': [
657 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak', 653 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak',
658 ], 654 ],
659 }, 655 },
660 ], 656 ],
661 }], 657 }],
658 ['enable_topchrome_md == 1', {
659 'copies': [
660 {
661 'destination': '<(PRODUCT_DIR)',
662 'files': [
663 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_material_100_perce nt.pak',
664 ],
665 },
666 ],
667 }],
668 ['enable_hidpi == 1 and enable_topchrome_md == 1', {
669 'copies': [
670 {
671 'destination': '<(PRODUCT_DIR)',
672 'files': [
673 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_material_200_perce nt.pak',
674 ],
675 },
676 ],
677 }],
662 ], # conditions 678 ], # conditions
663 }], # end OS != "mac" and OS != "ios" 679 }], # end OS != "mac" and OS != "ios"
664 ], # conditions 680 ], # conditions
665 }, 681 },
666 { 682 {
667 # GN version: //chrome/app/theme:chrome_unscaled_resources 683 # GN version: //chrome/app/theme:chrome_unscaled_resources
668 'target_name': 'chrome_unscaled_resources', 684 'target_name': 'chrome_unscaled_resources',
669 'type': 'none', 685 'type': 'none',
670 'actions': [ 686 'actions': [
671 { 687 {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
725 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak', 741 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak',
726 ], 742 ],
727 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak', 743 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak',
728 }, 744 },
729 'includes': [ '../build/repack_action.gypi' ], 745 'includes': [ '../build/repack_action.gypi' ],
730 }, 746 },
731 ], 747 ],
732 }, 748 },
733 ], # targets 749 ], # targets
734 } 750 }
OLDNEW
« no previous file with comments | « chrome/chrome_repack_chrome_material_200_percent.gypi ('k') | chrome/installer/linux/common/installer.include » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698