[iOS] Pack ios_strings_resources_${locale}.pak 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',
     'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html',
     'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/internal/additional_modules_list.txt',
     'omnibox_mojom_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/omnibox/omnibox.mojom.js',
   },
@@ skipping 434 matching lines @@
           'includes': ['chrome_repack_chrome_200_percent.gypi']
         },
       ],
       'conditions': [
         ['OS != "ios"', {
           'dependencies': [
             '<(DEPTH)/content/app/resources/content_resources.gyp:content_resources',
             '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
             '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
           ],
-        }, {  # else

[Nico, 2015/04/28 18:07:34]

why this change?

[sdefresne, 2015/04/29 07:36:24]

When editing gyp files, I find "else" block in condition really hard to find.
Here I was looking for 'OS == "ios"' block and could not find it so added a new
one, and then later found this "else" and merged them.

BTW, I'm probably not the only one to find "else" hard to understand since the
original code retested the same condition (that second test was useless) inside
the else block as you can see below. I think that removing the else and adding a
new 'OS == "ios"' block explicitly make it the code easier to read and update.

[Nico, 2015/04/29 15:33:16]

I find the new spelling very confusing. Please keep this as it was (in this
change, not in a follow-up).

[sdefresne, 2015/04/29 16:26:58]

Sure. Done.

+        }],
+        ['OS == "ios"', {
+          'dependencies': [
+            '<(DEPTH)/ios/chrome/ios_chrome_resources.gyp:ios_strings_resources_gen',
+          ],
           'actions': [
             {
-              'conditions': [
-                ['OS == "ios"', {
-                  'includes': ['chrome_repack_chrome_300_percent.gypi']
-                }],
-              ],
+              'includes': ['chrome_repack_chrome_300_percent.gypi']
             },
           ],
         }],
         ['use_ash==1', {
           'dependencies': [
              '<(DEPTH)/ash/ash_resources.gyp:ash_resources',
              '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
           ],
         }],
         ['chromeos==1', {
@@ skipping 147 matching lines @@
                      '<(generator_path)',
                      'credits',
                      '<(about_credits_file)',
           ],
           'message': 'Generating about:credits',
         },
       ],
     },
   ], # targets
 }