Retry of 2b0e51237fa07b4fb9f6c20edcefce094f6cf5f5

chrome/chrome_resources.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     # Apply Chrome-specific grit settings to all of this file.
     # The advantage is that one entry here applies to the entire file.
     # The caveat is these variables cannot be merged with other variable
     # dictionaries in more inner scopes. If the variable should be merged,
     # consider putting them in a gypi file and including it at the right scope
@@ skipping 524 matching lines @@
             'pak_locales': '<(pseudo_locales)',
           },
           'includes': ['chrome_repack_locales.gypi']
         },
         {
           'includes': ['chrome_repack_chrome_100_percent.gypi']
         },
         {
           'includes': ['chrome_repack_chrome_200_percent.gypi']
         },
-        {
-          'includes': ['chrome_repack_chrome_material_100_percent.gypi']
-        },
-        {
-          'includes': ['chrome_repack_chrome_material_200_percent.gypi']
-        },
       ],
       'conditions': [  # GN version: chrome_repack_locales.gni template("_repack_one_locale")
         ['OS != "ios"', {
           'dependencies': [  # Update duplicate logic in repack_locales.py
             '<(DEPTH)/content/app/resources/content_resources.gyp:content_resources',
             '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
             '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:bluetooth_strings',
             '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
           ],
         }, {  # else
@@ skipping 33 matching lines @@
         ['enable_extensions==1', {
           'dependencies': [  # Update duplicate logic in repack_locales.py
             '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings',
           ],
         }],
         ['enable_app_list==1', {
           'dependencies': [
              '<(DEPTH)/ui/app_list/resources/app_list_resources.gyp:app_list_resources',
           ],
         }],
+        ['OS == "mac"', {
+          'actions': [
+            {
+              'includes': ['chrome_repack_chrome_material_100_percent.gypi']
+            },
+            {
+              'includes': ['chrome_repack_chrome_material_200_percent.gypi']
+            },
+          ],
+        }],
         ['OS != "mac" and OS != "ios"', {
           # Copy pak files to the product directory. These files will be picked
           # up by the following installer scripts:
           #   - Windows: chrome/installer/mini_installer/chrome.release
           #   - Linux: chrome/installer/linux/internal/common/installer.include
           # Ensure that the above scripts are updated when adding or removing
           # pak files.
           # Copying files to the product directory is not needed on the Mac
           # since the framework build phase will copy them into the framework
           # bundle directly.
@@ skipping 34 matching lines @@
             ['enable_hidpi == 1', {
               'copies': [
                 {
                   'destination': '<(PRODUCT_DIR)',
                   'files': [
                     '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak',
                   ],
                 },
               ],
             }],
-            ['enable_topchrome_md == 1', {
-              'copies': [
-                {
-                  'destination': '<(PRODUCT_DIR)',
-                  'files': [
-                    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_material_100_percent.pak',
-                  ],
-                },
-              ],
-            }],
-            ['enable_hidpi == 1 and enable_topchrome_md == 1', {
-              'copies': [
-                {
-                  'destination': '<(PRODUCT_DIR)',
-                  'files': [
-                    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_material_200_percent.pak',
-                  ],
-                },
-              ],
-            }],
           ], # conditions
         }], # end OS != "mac" and OS != "ios"
       ], # conditions
     },
     {
       # GN version: //chrome/app/theme:chrome_unscaled_resources
       'target_name': 'chrome_unscaled_resources',
       'type': 'none',
       'actions': [
         {
@@ skipping 53 matching lines @@
               '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak',
             ],
             'pak_output': '<(PRODUCT_DIR)/browser_tests.pak',
           },
           'includes': [ '../build/repack_action.gypi' ],
         },
       ],
     },
   ], # targets
 }