Have 'browser_tests_dll' use the common chrome_dll_version.rc generated

by the (new) 'chrome_dll_version' target, not by rolling its own.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/125017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18252 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 52 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 735ee10..7e4b42b 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -4023,6 +4023,7 @@
           'dependencies': [
             'app',
             'browser',
+            'chrome_dll_version',
             'chrome_resources',
             'installer/installer.gyp:installer_util_strings',
             'debugger',
@@ -4045,58 +4046,6 @@
               },
             },
           },
-          'rules': [
-            {
-              'rule_name': 'win_version',
-              'extension': 'version',
-              'variables': {
-                'lastchange_path':
-                  '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
-                'version_py': 'tools/build/version.py',
-                'version_path': 'VERSION',
-                'template_input_path': 'app/chrome_dll_version.rc.version',
-                'template_output_path': '<(grit_out_dir)/chrome_dll_version.rc',
-              },
-              'conditions': [
-                [ 'branding == "Chrome"', {
-                  'variables': {
-                     'branding_path': 'app/theme/google_chrome/BRANDING',
-                  },
-                }, { # else branding!="Chrome"
-                  'variables': {
-                     'branding_path': 'app/theme/chromium/BRANDING',
-                  },
-                }],
-              ],
-              'inputs': [
-                '<(template_input_path)',
-                '<(version_path)',
-                '<(branding_path)',
-                '<(lastchange_path)',
-              ],
-              'outputs': [
-                # Use a non-existant output so this action always runs and
-                # generates version information, e.g. to capture revision
-                # changes, which aren't captured by file dependencies.
-                '<(grit_out_dir)/chrome_dll_version.always',
-
-                # And this is the real output, so that the build system knows
-                # what action generates it.
-                '<(template_output_path)',
-              ],
-              'action': [
-                'python',
-                '<(version_py)',
-                '-f', '<(version_path)',
-                '-f', '<(branding_path)',
-                '-f', '<(lastchange_path)',
-                '<(template_input_path)',
-                '<(template_output_path)',
-              ],
-              'process_outputs_as_sources': 1,
-              'message': 'Generating version information in <(template_output_path)'
-            },
-          ],
           'sources': [
 	    'test/browser/run_all_unittests.cc',
             'test/in_process_browser_test.cc',
@@ -4109,6 +4058,7 @@
             'tools/build/win/precompiled_wtl.h',
             'tools/build/win/precompiled_wtl.cc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
 	    # browser_tests_sources and browser_tests_source_win_specific are
 	    # defined in 'variables' at the top of the file.