add .pak files to list of grd outputs (so make can compute dependencies)

chrome/chrome.gyp

 # Copyright (c) 2009 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': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/common.gypi',
@@ skipping 24 matching lines @@
         ['include', '/win_[^/]*\\.cc$'],
       ]}],
     ],
   },
   'targets': [
     {
       # 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': 'resources',
+      'target_name': 'chrome_resources',
       'type': 'none',
       'rules': [
         {
           'rule_name': 'grit',
           'extension': 'grd',
           'inputs': [
             '../tools/grit/grit.py',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/<(RULE_INPUT_ROOT).h',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_ROOT).pak',
           ],
           'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/chrome'],
           'message': 'Generating resources from <(RULE_INPUT_PATH)',
         },
       ],
       'sources': [
-        # All .grd files under chrome.
-        'app/resources/locale_settings.grd',
+        # Data resources.
         'app/theme/theme_resources.grd',
-        'app/chromium_strings.grd',
-        'app/generated_resources.grd',
-        'app/google_chrome_strings.grd',
         'browser/debugger/resources/debugger_resources.grd',
         'browser/browser_resources.grd',
         'common/common_resources.grd',
         'renderer/renderer_resources.grd',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '<(SHARED_INTERMEDIATE_DIR)/chrome',
         ],
       },
     },
     {
+      # 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',
+      'rules': [
+        {
+          'rule_name': 'grit',
+          'extension': 'grd',
+          'inputs': [
+            '../tools/grit/grit.py',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/<(RULE_INPUT_ROOT).h',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_ROOT)_en-US.pak',
+          ],
+          'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/chrome'],
+          'message': 'Generating resources from <(RULE_INPUT_PATH)',
+        },
+      ],
+      'sources': [
+        # Localizable resources.
+        'app/resources/locale_settings.grd',
+        'app/chromium_strings.grd',
+        'app/generated_resources.grd',
+        'app/google_chrome_strings.grd',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(SHARED_INTERMEDIATE_DIR)/chrome',
+        ],
+      },
+    },
+    {
       'target_name': 'common',
       'type': '<(library)',
       'dependencies': [
-        'resources',
+        'chrome_resources',
+        'chrome_strings',
         '../base/base.gyp:base',
         '../base/base.gyp:base_gfx',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../third_party/icu38/icu38.gyp:icui18n',
         '../third_party/icu38/icu38.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/zlib/zlib.gyp:zlib',
         '../third_party/npapi/npapi.gyp:npapi',
@@ skipping 260 matching lines @@
             'common/os_exchange_data.cc',
           ],
         }],
       ],
     },
     {
       'target_name': 'browser',
       'type': '<(library)',
       'dependencies': [
         'common',
-        'resources',
+        'chrome_resources',
+        'chrome_strings',
         '../media/media.gyp:media',
         '../net/net.gyp:net_resources',
         '../skia/skia.gyp:skia',
         '../third_party/icu38/icu38.gyp:icui18n',
         '../third_party/icu38/icu38.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         'third_party/hunspell/hunspell.gyp:hunspell',
         '../webkit/webkit.gyp:glue',
       ],
@@ skipping 1095 matching lines @@
             'browser/window_sizer.cc',
           ],
         }],
       ],
     },
     {
       'target_name': 'plugin',
       'type': '<(library)',
       'dependencies': [
         'common',
-        'resources',
+        'chrome_resources',
+        'chrome_strings',
         '../media/media.gyp:media',
         '../skia/skia.gyp:skia',
         '../third_party/icu38/icu38.gyp:icui18n',
         '../third_party/icu38/icu38.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         'third_party/hunspell/hunspell.gyp:hunspell',
         '../webkit/webkit.gyp:glue',
       ],
       'include_dirs': [
@@ skipping 36 matching lines @@
           ],
         },],
       ],
     },
     {
       'target_name': 'renderer',
       'type': '<(library)',
       'dependencies': [
         'common',
         'plugin',
-        'resources',
+        'chrome_resources',
+        'chrome_strings',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/icu38/icu38.gyp:icui18n',
         '../third_party/icu38/icu38.gyp:icuuc',
         '../third_party/npapi/npapi.gyp:npapi',
         '../webkit/webkit.gyp:glue',
         '../webkit/webkit.gyp:webkit',
       ],
       'include_dirs': [
         '..',
@@ skipping 358 matching lines @@
     },
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': '<(library)',
       'dependencies': [
         'browser',
         'common',
         'renderer',
-        'resources',
+        'chrome_resources',
+        'chrome_strings',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         # TODO:  these should live here but are currently used by
         # production code code in libbrowser (above).
         #'browser/automation/url_request_mock_http_job.cc',
@@ skipping 50 matching lines @@
             'test/automation/autocomplete_edit_proxy.h',
           ],
         }],
       ],
     },
     {
       'target_name': 'test_support_ui',
       'type': '<(library)',
       'dependencies': [
         'test_support_common',
-        'resources',
+        'chrome_resources',
+        'chrome_strings',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/testing_browser_process.h',
         'test/ui/npapi_test_helper.cc',
         'test/ui/npapi_test_helper.h',
@@ skipping 14 matching lines @@
             'test/ui/npapi_test_helper.cc',
           ],
         }],
       ],
     },
     {
       'target_name': 'test_support_unit',
       'type': '<(library)',
       'dependencies': [
         'test_support_common',
-        'resources',
+        'chrome_resources',
+        'chrome_strings',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/unit/run_all_unittests.cc',
       ],
       'conditions': [
@@ skipping 32 matching lines @@
         }],
       ],
     },
     {
       'target_name': 'ui_tests',
       'type': 'executable',
       'dependencies': [
         'app',
         'browser',
         'common',
-        'resources',
+        'chrome_resources',
+        'chrome_strings',
         'test_support_ui',
         '../base/base.gyp:base',
         '../net/net.gyp:net',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu38/icu38.gyp:icui18n',
         '../third_party/icu38/icu38.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
       ],
@@ skipping 125 matching lines @@
         }],
       ],
     },
     {
       'target_name': 'unit_tests',
       'type': 'executable',
       'dependencies': [
         'browser',
         'common',
         'renderer',
-        'resources',
+        'chrome_resources',
+        'chrome_strings',
         'test_support_unit',
         '../printing/printing.gyp:printing',
         '../webkit/webkit.gyp:webkit',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu38/icu38.gyp:icui18n',
         '../third_party/icu38/icu38.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
       ],
@@ skipping 296 matching lines @@
         }],
       ],
     },
     {
       'target_name': 'startup_tests',
       'type': 'executable',
       'dependencies': [
         'app',
         'browser',
         'common',
-        'resources',
+        'chrome_resources',
+        'chrome_strings',
         'test_support_ui',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         'test/startup/feature_startup_test.cc',
         'test/startup/startup_test.cc',
         'tools/build/win/precompiled.cc',
         'tools/build/win/precompiled.h',
@@ skipping 11 matching lines @@
             'tools/build/win/precompiled.cc',
             'tools/build/win/precompiled.h',
           ],
         }],
       ],
     },
     {
       'target_name': 'page_cycler_tests',
       'type': 'executable',
       'dependencies': [
-        'resources',
+        'chrome_resources',
+        'chrome_strings',
         'test_support_ui',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         'test/page_cycler/page_cycler_test.cc',
         'test/perf/mem_usage.cc',
         'test/perf/mem_usage.h',
         'tools/build/win/precompiled.cc',
@@ skipping 75 matching lines @@
       ]
     }, { # else: OS != "mac"
       'targets': [
         {
           'target_name': 'perf_tests',
           'type': 'executable',
           'dependencies': [
             'browser',
             'common',
             'renderer',
-            'resources',
+            'chrome_resources',
+            'chrome_strings',
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
             '../webkit/webkit.gyp:glue',
           ],
           'sources': [
             'browser/visitedlink_perftest.cc',
             'test/perf/perftests.cc',
             'test/perf/url_parse_perftest.cc',
@@ skipping 17 matching lines @@
         },
       ],
     }],  # OS!="mac"
     ['OS=="win" or OS=="linux"',
       { 'targets': [
         {
           'target_name': 'views',
           'type': '<(library)',
           'dependencies': [
             'common',
-            'resources',
+            'chrome_resources',
+            'chrome_strings',
             '../media/media.gyp:media',
             '../skia/skia.gyp:skia',
             '../third_party/icu38/icu38.gyp:icui18n',
             '../third_party/icu38/icu38.gyp:icuuc',
             '../third_party/libxml/libxml.gyp:libxml',
             '../third_party/npapi/npapi.gyp:npapi',
             'third_party/hunspell/hunspell.gyp:hunspell',
             '../webkit/webkit.gyp:glue',
           ],
           'sources': [
@@ skipping 315 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }