Use BRANDING for IE CEEE. Simplify chrome_dll_version handling.

chrome/chrome_dll.gypi

 # Copyright (c) 2010 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.
 {
   'target_defaults': {
     'variables': {
       'chrome_dll_target': 0,
     },
     'target_conditions': [
       ['chrome_dll_target==1', {
@@ skipping 59 matching lines @@
           'dependencies': [
             '<@(chromium_dependencies)',
           ],
           'conditions': [
             ['OS=="win"', {
               'product_name': 'chrome',
               'msvs_guid': 'C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9',
               'dependencies': [
                 # On Windows, link the dependencies (libraries) that make
                 # up actual Chromium functionality into this .dll.
-                'chrome_dll_version',
+                'chrome_version_header',
                 'chrome_resources',
                 'installer_util_strings',
                 'worker',
                 '../printing/printing.gyp:printing',
                 '../net/net.gyp:net_resources',
                 '../build/util/support/support.gyp:*',
                 '../third_party/cld/cld.gyp:cld',
                 '../views/views.gyp:views',
                 '../webkit/support/webkit_support.gyp:webkit_resources',
                 '../gears/gears.gyp:gears',
               ],
               'sources': [
                 'app/chrome_command_ids.h',
                 'app/chrome_dll.rc',
                 'app/chrome_dll_resource.h',
                 'app/chrome_main.cc',
-                '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+                'app/chrome_dll_version.rc',
 
                 '../webkit/glue/resources/aliasb.cur',
                 '../webkit/glue/resources/cell.cur',
                 '../webkit/glue/resources/col_resize.cur',
                 '../webkit/glue/resources/copy.cur',
                 '../webkit/glue/resources/row_resize.cur',
                 '../webkit/glue/resources/vertical_text.cur',
                 '../webkit/glue/resources/zoom_in.cur',
                 '../webkit/glue/resources/zoom_out.cur',
 
                 # TODO:  It would be nice to have these pulled in
                 # automatically from direct_dependent_settings in
                 # their various targets (net.gyp:net_resources, etc.),
                 # but that causes errors in other targets when
                 # resulting .res files get referenced multiple times.
                 '<(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/renderer_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
 
                 # TODO(sgk):  left-over from pre-gyp build, figure out
                 # if we still need them and/or how to update to gyp.
                 #'app/check_dependents.bat',
                 #'app/chrome.dll.deps',
               ],
+              'include_dirs': [
+                # For version.h
+                '<(SHARED_INTERMEDIATE_DIR)',
+              ],
               'msvs_settings': {
                 'VCLinkerTool': {
                   'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
                   'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
                 },
               },
             }],  # OS=="win"
             ['OS=="mac"', {
               # The main browser executable's name is <(mac_product_name).
               # Certain things will get confused if two modules in the
@@ skipping 416 matching lines @@
         {
           'target_name': 'chrome_dll_nacl_win64',
           'type': 'shared_library',
           'product_name': 'nacl64',
           'msvs_guid': 'F5B2D851-1279-4CE1-9386-AB7C6433551B',
           'variables': {
             'chrome_dll_target': 1,
           },
           'include_dirs': [
             '..',
+            # For version.h
+            '<(SHARED_INTERMEDIATE_DIR)',
           ],
           'dependencies': [
             '<@(nacl_win64_dependencies)',
-            'chrome_dll_version',
             'nacl_win64',
+            'chrome_version_header',

[MAD, 2010/11/26 13:28:16]

Why after nacl?

[Jói, 2010/11/26 16:07:28]

No reason, I moved it to the first line of dependencies.

           ],
           'defines': [
             '<@(nacl_win64_defines)',
           ],
           'sources': [
             'app/chrome_command_ids.h',
             'app/chrome_dll_resource.h',
             'app/chrome_main.cc',
+            'app/chrome_dll_version.rc',

[MAD, 2010/11/26 13:28:16]

above chrome_main?

[Jói, 2010/11/26 16:07:28]

Done.

+
             'browser/renderer_host/render_process_host_dummy.cc',
             'common/googleurl_dummy.cc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/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.),
             # but that causes errors in other targets when
             # resulting .res files get referenced multiple times.
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
 
             # TODO(sgk):  left-over from pre-gyp build, figure out
@@ skipping 14 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },  # target chrome_dll
       ],
     }],
   ],
 }