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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 1991573002: Remove enable_topchrome_md build flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mac again 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 { 545 ],
546 'includes': ['chrome_repack_chrome_material_100_percent.gypi'] 546 'conditions': [
Lei Zhang 2016/05/19 21:51:53 Delete?
Evan Stade 2016/05/19 22:02:30 Done.
547 },
548 {
549 'includes': ['chrome_repack_chrome_material_200_percent.gypi']
550 },
551 ], 547 ],
552 'conditions': [ # GN version: chrome_repack_locales.gni template("_repack _one_locale") 548 'conditions': [ # GN version: chrome_repack_locales.gni template("_repack _one_locale")
553 ['OS != "ios"', { 549 ['OS != "ios"', {
554 'dependencies': [ # Update duplicate logic in repack_locales.py 550 'dependencies': [ # Update duplicate logic in repack_locales.py
555 '<(DEPTH)/content/app/resources/content_resources.gyp:content_resour ces', 551 '<(DEPTH)/content/app/resources/content_resources.gyp:content_resour ces',
556 '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings', 552 '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
557 '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:bluetooth_strings', 553 '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:bluetooth_strings',
558 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resour ces', 554 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resour ces',
559 ], 555 ],
560 }, { # else 556 }, { # else
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 ['enable_extensions==1', { 589 ['enable_extensions==1', {
594 'dependencies': [ # Update duplicate logic in repack_locales.py 590 'dependencies': [ # Update duplicate logic in repack_locales.py
595 '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings', 591 '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings',
596 ], 592 ],
597 }], 593 }],
598 ['enable_app_list==1', { 594 ['enable_app_list==1', {
599 'dependencies': [ 595 'dependencies': [
600 '<(DEPTH)/ui/app_list/resources/app_list_resources.gyp:app_list_res ources', 596 '<(DEPTH)/ui/app_list/resources/app_list_resources.gyp:app_list_res ources',
601 ], 597 ],
602 }], 598 }],
599 ['OS == "mac"', {
600 'actions': [
601 {
602 'includes': ['chrome_repack_chrome_material_100_percent.gypi']
603 },
604 {
605 'includes': ['chrome_repack_chrome_material_200_percent.gypi']
606 },
607 ],
608 }],
603 ['OS != "mac" and OS != "ios"', { 609 ['OS != "mac" and OS != "ios"', {
604 # Copy pak files to the product directory. These files will be picked 610 # Copy pak files to the product directory. These files will be picked
605 # up by the following installer scripts: 611 # up by the following installer scripts:
606 # - Windows: chrome/installer/mini_installer/chrome.release 612 # - Windows: chrome/installer/mini_installer/chrome.release
607 # - Linux: chrome/installer/linux/internal/common/installer.include 613 # - Linux: chrome/installer/linux/internal/common/installer.include
608 # Ensure that the above scripts are updated when adding or removing 614 # Ensure that the above scripts are updated when adding or removing
609 # pak files. 615 # pak files.
610 # Copying files to the product directory is not needed on the Mac 616 # Copying files to the product directory is not needed on the Mac
611 # since the framework build phase will copy them into the framework 617 # since the framework build phase will copy them into the framework
612 # bundle directly. 618 # bundle directly.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 ['enable_hidpi == 1', { 653 ['enable_hidpi == 1', {
648 'copies': [ 654 'copies': [
649 { 655 {
650 'destination': '<(PRODUCT_DIR)', 656 'destination': '<(PRODUCT_DIR)',
651 'files': [ 657 'files': [
652 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak', 658 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak',
653 ], 659 ],
654 }, 660 },
655 ], 661 ],
656 }], 662 }],
657 ['enable_topchrome_md == 1', {
658 'copies': [
659 {
660 'destination': '<(PRODUCT_DIR)',
661 'files': [
662 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_material_100_perce nt.pak',
663 ],
664 },
665 ],
666 }],
667 ['enable_hidpi == 1 and enable_topchrome_md == 1', {
668 'copies': [
669 {
670 'destination': '<(PRODUCT_DIR)',
671 'files': [
672 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_material_200_perce nt.pak',
673 ],
674 },
675 ],
676 }],
677 ], # conditions 663 ], # conditions
678 }], # end OS != "mac" and OS != "ios" 664 }], # end OS != "mac" and OS != "ios"
679 ], # conditions 665 ], # conditions
680 }, 666 },
681 { 667 {
682 # GN version: //chrome/app/theme:chrome_unscaled_resources 668 # GN version: //chrome/app/theme:chrome_unscaled_resources
683 'target_name': 'chrome_unscaled_resources', 669 'target_name': 'chrome_unscaled_resources',
684 'type': 'none', 670 'type': 'none',
685 'actions': [ 671 'actions': [
686 { 672 {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak', 726 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak',
741 ], 727 ],
742 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak', 728 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak',
743 }, 729 },
744 'includes': [ '../build/repack_action.gypi' ], 730 'includes': [ '../build/repack_action.gypi' ],
745 }, 731 },
746 ], 732 ],
747 }, 733 },
748 ], # targets 734 ], # targets
749 } 735 }
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