Add iOS support to the chrome/ resource gyp/gypi files

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': {
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
     'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
   },
   'targets': [
     {
       'target_name': 'chrome_extra_resources',
       'type': 'none',
-      'dependencies': [
-        '../content/browser/debugger/devtools_resources.gyp:devtools_resources',
-      ],
       # These resources end up in resources.pak because they are resources
       # used by internal pages.  Putting them in a spearate pak file makes
       # it easier for us to reference them internally.
       'actions': [
         {
-          'action_name': 'component_extension_resources',
-          'variables': {
-            'grit_grd_file': 'browser/resources/component_extension_resources.grd',
-          },
-          'includes': [ '../build/grit_action.gypi' ],
-        },
-        {
-          'action_name': 'net_internals_resources',
-          'variables': {
-            'grit_grd_file': 'browser/resources/net_internals_resources.grd',
-          },
-          'includes': [ '../build/grit_action.gypi' ],
-        },
-        {
-          'action_name': 'options_resources',
-          'variables': {
-            'grit_grd_file': 'browser/resources/options_resources.grd',
-          },
-          'includes': [ '../build/grit_action.gypi' ],
-        },
-        {
-          'action_name': 'quota_internals_resources',
-          'variables': {
-            'grit_grd_file': 'browser/resources/quota_internals_resources.grd',
-          },
-          'includes': [ '../build/grit_action.gypi' ],
-        },
-        {
           'action_name': 'shared_resources',
           'variables': {
             'grit_grd_file': 'browser/resources/shared_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
           'action_name': 'sync_internals_resources',
           'variables': {

[Nico, 2012/10/17 17:06:28]

You have about:sync-internals on ios?

[stuartmorgan, 2012/10/17 20:35:26]

We do, yes. We recently got WebUI working, and expect to bring more (e.g.,
net_internals) online over time.

             'grit_grd_file': 'browser/resources/sync_internals_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
-        {
-          'action_name': 'devtools_discovery_page_resources',
-          'variables': {
-            'grit_grd_file':
-               'browser/debugger/frontend/devtools_discovery_page_resources.grd',
-          },
-          'includes': [ '../build/grit_action.gypi' ]
-        },
       ],
       'includes': [ '../build/grit_target.gypi' ],
-      'copies': [
-        {
-          'destination': '<(PRODUCT_DIR)/resources/extension/demo',
-          'files': [
-            'browser/resources/extension_resource/demo/library.js',
+      'conditions': [
+        ['OS != "ios"', {
+          'dependencies': [
+            '../content/browser/debugger/devtools_resources.gyp:devtools_resources',
           ],
-        },
-      ]
+          'actions': [
+            {
+              'action_name': 'component_extension_resources',
+              'variables': {
+                'grit_grd_file': 'browser/resources/component_extension_resources.grd',
+              },
+              'includes': [ '../build/grit_action.gypi' ],
+            },
+            {
+              'action_name': 'net_internals_resources',
+              'variables': {
+                'grit_grd_file': 'browser/resources/net_internals_resources.grd',
+              },
+              'includes': [ '../build/grit_action.gypi' ],
+            },
+            {
+              'action_name': 'options_resources',
+              'variables': {
+                'grit_grd_file': 'browser/resources/options_resources.grd',
+              },
+              'includes': [ '../build/grit_action.gypi' ],
+            },
+            {
+              'action_name': 'quota_internals_resources',
+              'variables': {
+                'grit_grd_file': 'browser/resources/quota_internals_resources.grd',
+              },
+              'includes': [ '../build/grit_action.gypi' ],
+            },
+            {
+              'action_name': 'devtools_discovery_page_resources',
+              'variables': {
+                'grit_grd_file':
+                   'browser/debugger/frontend/devtools_discovery_page_resources.grd',
+              },
+              'includes': [ '../build/grit_action.gypi' ]
+            },
+          ],
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)/resources/extension/demo',
+              'files': [
+                'browser/resources/extension_resource/demo/library.js',
+              ],
+            },
+          ],
+        }],
+      ],
     },
     {
       # TODO(mark): It would be better if each static library that needed
       # to run grit would list its own .grd files, but unfortunately some
       # of the static libraries currently have circular dependencies among
       # generated headers.
       'target_name': 'chrome_resources',
       'type': 'none',
       'actions': [
         # Data resources.
         {
           'action_name': 'browser_resources',
           'variables': {
             'grit_grd_file': 'browser/browser_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
           'action_name': 'common_resources',
           'variables': {
             'grit_grd_file': 'common/common_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
           'action_name': 'renderer_resources',
           'variables': {
             'grit_grd_file': 'renderer/resources/renderer_resources.grd',

[Nico, 2012/10/17 17:06:28]

Do you need these? You don't have a renderer process after all.

[stuartmorgan, 2012/10/17 20:35:26]

Temporarily, yes; we use a network error page resource that didn't get moved out
of this grd when we moved the error page code out of chrome/renderer, which was
an oversight that I found while doing this CL. I already have an internal bug
filed about it, and we'll fix it soon, but I didn't want it to block merging our
fork of this file on that. Once that's in I'll exclude this too.

           },
           'includes': [ '../build/grit_action.gypi' ],
         },
-        {
-          'action_name': 'extensions_api_resources',
-          'variables': {
-            'grit_grd_file': 'common/extensions_api_resources.grd',
-          },
-          'includes': [ '../build/grit_action.gypi' ],
-        }
+      ],
+      'conditions': [
+        ['OS != "ios"', {
+          'actions': [
+            {
+              'action_name': 'extensions_api_resources',
+              'variables': {
+                'grit_grd_file': 'common/extensions_api_resources.grd',
+              },
+              'includes': [ '../build/grit_action.gypi' ],
+            }
+          ],
+        }],
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
       # TODO(mark): It would be better if each static library that needed
       # to run grit would list its own .grd files, but unfortunately some
       # of the static libraries currently have circular dependencies among
       # generated headers.
       'target_name': 'chrome_strings',
       'type': 'none',
@@ skipping 43 matching lines @@
             'conditions': [
               ['chromeos==1', {
                 'platform_locale_settings_grd':
                     'app/resources/locale_settings_cros.grd',
               }, {  # chromeos==0
                 'platform_locale_settings_grd':
                     'app/resources/locale_settings_linux.grd',
               }],
             ],
           },],
-          ['os_posix == 1 and OS != "mac" and OS != "linux"', {
+          ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "linux"', {
             'platform_locale_settings_grd':
                 'app/resources/locale_settings_linux.grd',
           },],
-          ['OS=="mac"', {
+          ['OS == "mac" or OS == "ios"', {
             'platform_locale_settings_grd':
                 'app/resources/locale_settings_mac.grd',
           }],
         ],  # conditions
       },  # variables
       'actions': [
         {
           'action_name': 'platform_locale_settings',
           'variables': {
             'grit_grd_file': '<(platform_locale_settings_grd)',
@@ skipping 33 matching lines @@
       },
       'dependencies': [
         'chrome_extra_resources',
       ],
       'actions': [
         {
           'includes': ['chrome_repack_resources.gypi']
         },
       ],
       'conditions': [
-        ['OS != "mac"', {
+        ['OS != "mac" and OS != "ios"', {
           # We'll install the resource files to the product directory.  The Mac
           # copies the results over as bundle resources in its own special way.
           'copies': [
             {
               'destination': '<(PRODUCT_DIR)',
               'files': [
                 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak'
               ],
             },
           ],
-        }]
-      ]
+        }],
+      ],
     },
     {
       'target_name': 'packed_resources',
       'type': 'none',
       'variables': {
         'repack_path': '../tools/grit/grit/format/repack.py',
       },
       'dependencies': [
         # MSVS needs the dependencies explictly named, Make is able to
         # derive the dependencies from the output files.
         'chrome_resources',
         'chrome_strings',
         'platform_locale_settings',
         'theme_resources',
-        # TODO(zork): Protect this with if use_aura==1
-        '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
-        '<(DEPTH)/content/content_resources.gyp:content_resources',
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
       ],
       'actions': [
         {
           'includes': ['chrome_repack_chrome.gypi']
         },
         {
           'includes': ['chrome_repack_locales.gypi']
         },
         {
           'includes': ['chrome_repack_pseudo_locales.gypi']
         },
         {
           'includes': ['chrome_repack_chrome_100_percent.gypi']
         },
         {
           'includes': ['chrome_repack_chrome_200_percent.gypi']
         },
         {
           'includes': ['chrome_repack_chrome_touch_100_percent.gypi']
         },
         {
           'includes': ['chrome_repack_chrome_touch_140_percent.gypi']
         },
         {
           'includes': ['chrome_repack_chrome_touch_180_percent.gypi']
         },
       ],
       'conditions': [
+        ['OS != "ios"', {
+          'dependencies': [
+            # TODO(zork): Protect this with if use_aura==1
+            '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
+            '<(DEPTH)/content/content_resources.gyp:content_resources',
+            '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
+            '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
+          ],
+        }],
         ['use_ash==1', {
           'dependencies': [
              '<(DEPTH)/ash/ash.gyp:ash_resources',
              '<(DEPTH)/ash/ash.gyp:ash_wallpaper_resources',
           ],
         }],
-        ['OS != "mac"', {
+        ['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.
           'copies': [
@@ skipping 52 matching lines @@
                   'destination': '<(PRODUCT_DIR)',
                   'files': [
                     '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_100_percent.pak',
                     '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_140_percent.pak',
                     '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_touch_180_percent.pak',
                   ],
                 },
               ],
             }],
           ], # conditions
-        }], # end OS != "mac"
+        }], # end OS != "mac" and OS != "ios"
       ], # conditions
     },
   ], # targets
 }