Undo removal of chrome_dll_version from r67457.

This is not a straight revert as we keep the part where chrome.dll
directly includes the generated .rc file instead of having it included
via chrome_dll.rc, as that seems to cause other dependency issues.

BUG=none
TEST=it builds, incremental builds on changes to chrome/VERSION work.

Review URL: http://codereview.chromium.org/5259007

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

1 files changed, 33 insertions, 21 deletions

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 0347af2..8c653e8 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -28,8 +28,8 @@
         'renderer',
         'chrome_resources',
         'chrome_strings',
-        'browser/policy/proto/device_management_proto.gyp:device_management_proto_cpp',
         'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
+        'browser/policy/proto/device_management_proto.gyp:device_management_proto_cpp',
         'theme_resources',
         '../base/base.gyp:test_support_base',
         '../skia/skia.gyp:skia',
@@ -384,7 +384,7 @@
           ],
           'dependencies': [
             '../app/app.gyp:app_resources',
-            'chrome.gyp:chrome_version_header',
+            'chrome.gyp:chrome_dll_version',
             'chrome.gyp:crash_service',  # run time dependency
             'chrome.gyp:installer_util_strings',
             '../sandbox/sandbox.gyp:sandbox',
@@ -401,7 +401,6 @@
             '../webkit/glue/resources/zoom_out.cur',
 
             'app/chrome_dll.rc',
-            'app/chrome_dll_version.rc',
             'test/data/resource.rc',
 
             # TODO:  It would be nice to have these pulled in
@@ -414,6 +413,7 @@
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
@@ -998,6 +998,7 @@
       },
       'sources': [
         'app/breakpad_mac_stubs.mm',
+        'app/chrome_dll.rc',
         # All unittests in browser, common, renderer and service.
         'browser/about_flags_unittest.cc',
         'browser/accessibility/browser_accessibility_mac_unittest.mm',
@@ -1802,7 +1803,7 @@
         }],
         ['OS=="win"', {
           'dependencies': [
-            'chrome_version_header',
+            'chrome_dll_version',
             'installer_util_strings',
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
             '../third_party/isimpledom/isimpledom.gyp:isimpledom',
@@ -1819,9 +1820,6 @@
             '<(DEPTH)/third_party/wtl/include',
           ],
           'sources': [
-            'app/chrome_dll.rc',
-            'app/chrome_dll_version.rc',
-
             # TODO:  It would be nice to have these pulled in
             # automatically from direct_dependent_settings in
             # their various targets (net.gyp:net_resources, etc.),
@@ -1832,6 +1830,7 @@
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
@@ -1858,6 +1857,7 @@
           },
         }, { # else: OS != "win"
           'sources!': [
+            'app/chrome_dll.rc',
             'browser/accessibility/browser_accessibility_win_unittest.cc',
             'browser/bookmarks/bookmark_codec_unittest.cc',
             'browser/bookmarks/bookmark_node_data_unittest.cc',
@@ -1922,6 +1922,10 @@
       'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
       'sources': [
         'app/breakpad_mac_stubs.mm',
+        'app/chrome_command_ids.h',
+        'app/chrome_dll.rc',
+        'app/chrome_dll_resource.h',
+        'app/chrome_dll_version.rc.version',
         'browser/autocomplete/autocomplete_browsertest.cc',
         'browser/browser_browsertest.cc',
         'browser/browsing_data_database_helper_browsertest.cc',
@@ -2136,13 +2140,10 @@
         }],
         ['OS=="win"', {
           'sources': [
-            'app/chrome_command_ids.h',
-            'app/chrome_dll_resource.h',
-            'app/chrome_dll.rc',
-            'app/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
@@ -2153,7 +2154,7 @@
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
-            'chrome_version_header',
+            'chrome_dll_version',
             'installer_util_strings',
             '../sandbox/sandbox.gyp:sandbox',
           ],
@@ -2175,6 +2176,10 @@
           }
         }, { # else: OS != "win"
           'sources!': [
+            'app/chrome_command_ids.h',
+            'app/chrome_dll.rc',
+            'app/chrome_dll_resource.h',
+            'app/chrome_dll_version.rc.version',
             'browser/extensions/extension_popup_apitest.cc',
             'browser/extensions/extension_rlz_apitest.cc',
             # TODO(jam): http://crbug.com/15101 These tests fail on Linux and
@@ -2269,6 +2274,7 @@
       ],
       'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
       'sources': [
+        'app/chrome_dll.rc',
         'browser/safe_browsing/safe_browsing_test.cc',
         'test/in_process_browser_test.cc',
         'test/in_process_browser_test.h',
@@ -2277,15 +2283,14 @@
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
-            'chrome_version_header',
+            'chrome_dll_version',
             'installer_util_strings',
             '../sandbox/sandbox.gyp:sandbox',
           ],
           'sources': [
-            'app/chrome_dll.rc',
-            'app/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
@@ -2732,6 +2737,10 @@
       # TODO(phajdan.jr): Only temporary, to make transition easier.
       'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
       'sources': [
+        'app/chrome_command_ids.h',
+        'app/chrome_dll.rc',
+        'app/chrome_dll_resource.h',
+        'app/chrome_dll_version.rc.version',
         'browser/autofill/autofill_common_test.cc',
         'browser/autofill/autofill_common_test.h',
         'browser/password_manager/password_form_data.cc',
@@ -2783,6 +2792,7 @@
         'test/ui_test_utils_linux.cc',
         'test/ui_test_utils_mac.mm',
         'test/ui_test_utils_win.cc',
+        'test/data/resource.rc',
       ],
       'conditions': [
         # Plugin code.
@@ -2812,13 +2822,9 @@
         }],
         ['OS=="win"', {
           'sources': [
-            'app/chrome_command_ids.h',
-            'app/chrome_dll.rc',
-            'app/chrome_dll_resource.h',
-            'app/chrome_dll_version.rc',
-            'test/data/resource.rc',
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
           ],
@@ -2826,7 +2832,7 @@
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
-            'chrome_version_header',
+            'chrome_dll_version',
             'installer_util_strings',
             '../sandbox/sandbox.gyp:sandbox',
           ],
@@ -2846,6 +2852,12 @@
               },
             },
           },
+        }, { # else: OS != "win"
+          'sources!': [
+            'app/chrome_dll.rc',
+            'app/chrome_dll_version.rc.version',
+            'test/data/resource.rc',
+          ],
         }],
         ['toolkit_views==1', {
           'dependencies': [