Rolling back 26904, didn't take chrome branding into account....

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,
 
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
@@ skipping 19 matching lines @@
       'app/chromium_strings.grd',
       'app/generated_resources.grd',
       'app/google_chrome_strings.grd',
     ],
     'chrome_resources_grds': [
       # Data resources.
       'browser/browser_resources.grd',
       'common/common_resources.grd',
       'renderer/renderer_resources.grd',
     ],
-    'grit_info_cmd': ['python', '../tools/grit/grit_info.py'],
-    'grit_cmd': ['python', '../tools/grit/grit.py'],
-    'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
+    'grit_info_cmd': ['python', '../tools/grit/grit_info.py',],
+    'repack_locales_cmd': ['python', 'tools/build/repack_locales.py',],
     # TODO: remove this helper when we have loops in GYP
-    'apply_locales_cmd': ['python', 'tools/build/apply_locales.py'],
+    'apply_locales_cmd': ['python', 'tools/build/apply_locales.py',],
     'browser_tests_sources': [
       'browser/browser_browsertest.cc',
       'browser/browser_init_browsertest.cc',
       'browser/crash_recovery_browsertest.cc',
       'browser/download/save_page_browsertest.cc',
       'browser/gtk/bookmark_manager_browsertest.cc',
       'browser/gtk/view_id_util_browsertest.cc',
       'browser/ssl/ssl_browser_tests.cc',
       'browser/extensions/cross_origin_xhr_apitest.cc',
       'browser/extensions/execute_script_apitest.cc',
@@ skipping 136 matching lines @@
               }, {  # else: branding!="Chrome"
                 'chrome_build': '_chromium',
                 'branded_env': 'CHROMIUM_BUILD=chromium',
               }],
             ],
           },
           'inputs': [
             '<@(chrome_resources_inputs)',
           ],
           'outputs': [
-            '<(grit_out_dir)/<(RULE_INPUT_ROOT)/grit/<(RULE_INPUT_ROOT).h',
-            '<(grit_out_dir)/<(RULE_INPUT_ROOT)/<(RULE_INPUT_ROOT).pak',
+            '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h',
+            '<(grit_out_dir)/<(RULE_INPUT_ROOT).pak',
             # TODO(bradnelson): move to something like this instead
-            #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/<(RULE_INPUT_ROOT)\' <(chrome_resources_grds))',
+            #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_resources_grds))',
             # This currently cannot work because gyp only evaluates the
             # outputs once (rather than per case where the rule applies).
             # This means you end up with all the outputs from all the grd
             # files, which angers scons and confuses vstudio.
             # One alternative would be to turn this into several actions,
             # but that would be rather verbose.
           ],
-          'action': ['<@(grit_cmd)', '-i',
+          'action': ['python', '../tools/grit/grit.py', '-i',
             '<(RULE_INPUT_PATH)',
-            'build', '-o', '<(grit_out_dir)/<(RULE_INPUT_ROOT)',
+            'build', '-o', '<(grit_out_dir)',
             '-D', '<(chrome_build)',
             '-E', '<(branded_env)',
           ],
           'conditions': [
             ['use_titlecase_in_grd_files==1', {
               'action': ['-D', 'use_titlecase'],
             }],
           ],
           'message': 'Generating resources from <(RULE_INPUT_PATH)',
         },
       ],
       'sources': [
         '<@(chrome_resources_grds)',
         '<@(chrome_resources_inputs)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '<(grit_out_dir)/browser_resources',
-          '<(grit_out_dir)/common_resources',
-          '<(grit_out_dir)/renderer_resources',
+          '<(grit_out_dir)',
         ],
       },
       'conditions': [
         ['OS=="win"', {
           'dependencies': ['../build/win/system.gyp:cygwin'],
         }],
       ],
     },
     {
       # TODO(mark): It would be better if each static library that needed
@@ skipping 35 matching lines @@
                 'chrome_build': '_google_chrome',
               }, {  # else: branding!="Chrome"
                 'chrome_build': '_chromium',
               }],
             ],
           },
           'inputs': [
             '<@(chrome_strings_inputs)',
           ],
           'outputs': [
-            '<(grit_out_dir)/<(RULE_INPUT_ROOT)/grit/<(RULE_INPUT_ROOT).h',
+            '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h',
             # TODO: remove this helper when we have loops in GYP
-            '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(RULE_INPUT_ROOT)/<(RULE_INPUT_ROOT)_ZZLOCALE.pak\' <(locales))',
+            '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(RULE_INPUT_ROOT)_ZZLOCALE.pak\' <(locales))',
             # TODO(bradnelson): move to something like this
-            #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/<(RULE_INPUT_ROOT)\' <(chrome_strings_grds))',
+            #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_strings_grds))',
             # See comment in chrome_resources as to why.
           ],
-          'action': ['<@(grit_cmd)', '-i', '<(RULE_INPUT_PATH)',
-                    'build', '-o', '<(grit_out_dir)/<(RULE_INPUT_ROOT)',
+          'action': ['python', '../tools/grit/grit.py', '-i',
+                    '<(RULE_INPUT_PATH)',
+                    'build', '-o', '<(grit_out_dir)',
                     '-D', '<(chrome_build)'],
           'conditions': [
             ['chromeos==1', {
               'action': ['-D', 'chromeos'],
             }],
             ['use_titlecase_in_grd_files==1', {
               'action': ['-D', 'use_titlecase'],
             }],
           ],
           'message': 'Generating resources from <(RULE_INPUT_PATH)',
         },
       ],
       'sources': [
         '<@(chrome_strings_grds)',
         '<@(chrome_strings_inputs)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '<(grit_out_dir)/locale_settings',
-          '<(grit_out_dir)/chromium_strings',
-          '<(grit_out_dir)/generated_resources',
-          '<(grit_out_dir)/google_chrome_strings',
+          '<(grit_out_dir)',
         ],
       },
     },
     {
       # theme_resources also generates a .cc file, so it can't use the rules above.
       'target_name': 'theme_resources',
       'type': 'none',
       'msvs_guid' : 'A158FB0A-25E4-6523-6B5A-4BB294B73D31',
+      'variables': {
+        'grit_path': '../tools/grit/grit.py',
+      },
       'actions': [
         {
           'action_name': 'theme_resources',
           'variables': {
             'input_path': 'app/theme/theme_resources.grd',
             'conditions': [
               ['branding=="Chrome"', {
                 # TODO(mmoss) The .grd files look for _google_chrome, but for
                 # consistency they should look for GOOGLE_CHROME_BUILD like C++.
                 # Clean this up when Windows moves to gyp.
                 'chrome_build': '_google_chrome',
               }, {  # else: branding!="Chrome"
                 'chrome_build': '_chromium',
               }],
             ],
           },
           'inputs': [
             '<!@(<(grit_info_cmd) --inputs <(input_path))',
           ],
           'outputs': [
-            '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/theme_resources\' <(input_path))',
+            '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))',
           ],
           'action': [
-            '<@(grit_cmd)',
+            'python', '<(grit_path)',
             '-i', '<(input_path)', 'build',
-            '-o', '<(grit_out_dir)/theme_resources',
+            '-o', '<(grit_out_dir)',
             '-D', '<(chrome_build)'
           ],
           'conditions': [
             ['chromeos==1', {
               'action': ['-D', 'chromeos'],
             }],
             ['use_titlecase_in_grd_files==1', {
               'action': ['-D', 'use_titlecase'],
             }],
           ],
           'message': 'Generating resources from <(input_path)',
         },
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '<(grit_out_dir)/theme_resources',
+          '<(grit_out_dir)',
         ],
       },
       'conditions': [
         ['OS=="win"', {
           'dependencies': ['../build/win/system.gyp:cygwin'],
         }],
       ],
     },
     {
       'target_name': 'default_extensions',
@@ skipping 2477 matching lines @@
         'plugin',
         'chrome_resources',
         'chrome_strings',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/npapi/npapi.gyp:npapi',
         '../webkit/webkit.gyp:glue',
         '../webkit/webkit.gyp:webkit',
-        '../webkit/webkit.gyp:webkit_resources',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         # TODO(jrg): to link ipc_tests, these files need to be in renderer.a.
         # But app/ is the wrong directory for them.
         # Better is to remove the dep of *_tests on renderer, but in the
         # short term I'd like the build to work.
         'renderer/automation/dom_automation_controller.cc',
@@ skipping 978 matching lines @@
       'msvs_guid': '76235B67-1C27-4627-8A33-4B2E1EF93EDE',
       'dependencies': [
         'chrome',
         'browser',
         'debugger',
         'common',
         'chrome_resources',
         'chrome_strings',
         'syncapi',
         'test_support_ui',
-        'theme_resources',
         '../base/base.gyp:base',
         '../net/net.gyp:net',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
       ],
       'include_dirs': [
@@ skipping 129 matching lines @@
       'msvs_guid': 'ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC',
       'dependencies': [
         'chrome',
         'browser',
         'chrome_resources',
         'chrome_strings',
         'common',
         'debugger',
         'renderer',
         'syncapi',
-        'theme_resources',
         'test_support_unit',
         'utility',
         '../app/app.gyp:app_resources',
         '../ipc/ipc.gyp:ipc',
         '../net/net.gyp:net_resources',
         '../net/net.gyp:net_test_support',
         '../printing/printing.gyp:printing',
         '../webkit/webkit.gyp:webkit',
         '../webkit/webkit.gyp:webkit_resources',
         '../skia/skia.gyp:skia',
@@ skipping 609 matching lines @@
       'target_name': 'page_cycler_tests',
       'type': 'executable',
       'msvs_guid': 'C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7',
       'dependencies': [
         'chrome',
         'chrome_resources',
         'chrome_strings',
         'debugger',
         'test_support_common',
         'test_support_ui',
-        'theme_resources',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         'test/page_cycler/page_cycler_test.cc',
       ],
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
@@ skipping 665 matching lines @@
           'target_name': 'interactive_ui_tests',
           'type': 'executable',
           'msvs_guid': '018D4F38-6272-448F-A864-976DA09F05D0',
           'dependencies': [
             'chrome',
             'chrome_resources',
             'chrome_strings',
             'debugger',
             'test_support_common',
             'test_support_ui',
-            'theme_resources',
             'syncapi',
             '../third_party/hunspell/hunspell.gyp:hunspell',
             '../net/net.gyp:net_resources',
             '../skia/skia.gyp:skia',
             '../third_party/icu/icu.gyp:icui18n',
             '../third_party/libpng/libpng.gyp:libpng',
             '../third_party/libxml/libxml.gyp:libxml',
             '../third_party/zlib/zlib.gyp:zlib',
             '../testing/gtest.gyp:gtest',
             '../third_party/npapi/npapi.gyp:npapi',
@@ skipping 178 matching lines @@
           # Executable that runs each browser test in a new process.
           'target_name': 'browser_tests',
           'type': 'executable',
           'dependencies': [
             'browser',
             'chrome',
             'chrome_resources',
             'chrome_strings',
             'debugger',
             'test_support_common',
-            'theme_resources',
             '../base/base.gyp:test_support_base',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
             '../third_party/icu/icu.gyp:icui18n',
             '../third_party/icu/icu.gyp:icuuc',
           ],
           'include_dirs': [
             '..',
           ],
           'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
@@ skipping 556 matching lines @@
         {
           'target_name': 'plugin_tests',
           'type': 'executable',
           'msvs_guid': 'A1CAA831-C507-4B2E-87F3-AEC63C9907F9',
           'dependencies': [
             'chrome_resources',
             'chrome_strings',
             'security_tests',  # run time dependency
             'test_support_common',
             'test_support_ui',
-            'theme_resources',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
             '../third_party/libxml/libxml.gyp:libxml',
             '../third_party/libxslt/libxslt.gyp:libxslt',
             '../third_party/npapi/npapi.gyp:npapi',
           ],
           'include_dirs': [
             '..',
             'third_party/wtl/include',
           ],
@@ skipping 26 matching lines @@
         },
         {
           'target_name': 'selenium_tests',
           'type': 'executable',
           'msvs_guid': 'E3749617-BA3D-4230-B54C-B758E56D9FA5',
           'dependencies': [
             'chrome_resources',
             'chrome_strings',
             'test_support_common',
             'test_support_ui',
-            'theme_resources',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
           ],
           'include_dirs': [
             '..',
             'third_party/wtl/include',
           ],
           'sources': [
             'test/selenium/selenium_test.cc',
           ],
@@ skipping 497 matching lines @@
               'defines': [
                 'POSIX',
               ],
             }],
           ],
         },
       ],  # targets when chrome_personalization==1 and use_syncapi_stub==0
     }],
   ],  # 'conditions'
 }