| OLD | NEW | 
|---|
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 # This dict determines how chrome.dll is split into multiple parts. | 5 # This dict determines how chrome.dll is split into multiple parts. | 
| 6 { | 6 { | 
| 7   'parts': [ | 7   'parts': [ | 
| 8     # These sections are matched in order, and a matching input will go into | 8     # These sections are matched in order, and a matching input will go into | 
| 9     # the part for the last block that matches. Inputs are lower()d before | 9     # the part for the last block that matches. Inputs are lower()d before | 
| 10     # the regex is run. | 10     # the regex is run. | 
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 119   # linked into the other side. Each should be a 2-tuple, where the first is | 119   # linked into the other side. Each should be a 2-tuple, where the first is | 
| 120   # a regex for the .lib name, and the second is a regex for the .obj from | 120   # a regex for the .lib name, and the second is a regex for the .obj from | 
| 121   # that lib. The lib should not match anything in 'all'. | 121   # that lib. The lib should not match anything in 'all'. | 
| 122   # | 122   # | 
| 123   # Note: If you're considering adding something that isn't a _switches or a | 123   # Note: If you're considering adding something that isn't a _switches or a | 
| 124   # _constants file, it'd probably be better to break the target into separate | 124   # _constants file, it'd probably be better to break the target into separate | 
| 125   # .lib files. | 125   # .lib files. | 
| 126   'all_from_libs': [ | 126   'all_from_libs': [ | 
| 127     (r'autofill_common\.lib$', r'switches\.obj$'), | 127     (r'autofill_common\.lib$', r'switches\.obj$'), | 
| 128     (r'base_static\.lib$', r'base_switches\.obj$'), | 128     (r'base_static\.lib$', r'base_switches\.obj$'), | 
|  | 129     (r'\bbase\.lib$', r'file_path_constants\.obj$'), | 
| 129     (r'\bcc\.lib$', r'switches\.obj$'), | 130     (r'\bcc\.lib$', r'switches\.obj$'), | 
| 130     (r'\bcommon\.lib$', r'extension_constants\.obj$'), | 131     (r'\bcommon\.lib$', r'extension_constants\.obj$'), | 
| 131     (r'\bcommon\.lib$', r'extension_manifest_constants\.obj$'), | 132     (r'\bcommon\.lib$', r'extension_manifest_constants\.obj$'), | 
| 132     (r'\bcommon\.lib$', r'url_constants\.obj$'), | 133     (r'\bcommon\.lib$', r'url_constants\.obj$'), | 
| 133     (r'\bcommon\.lib$', r'view_type\.obj$'), | 134     (r'\bcommon\.lib$', r'view_type\.obj$'), | 
| 134     # It sort of looks like most of this lib could go in 'all', but there's a | 135     # It sort of looks like most of this lib could go in 'all', but there's a | 
| 135     # couple registration/initialization functions that make me a bit nervous. | 136     # couple registration/initialization functions that make me a bit nervous. | 
| 136     (r'common_constants\.lib$', r'chrome_constants\.obj$'), | 137     (r'common_constants\.lib$', r'chrome_constants\.obj$'), | 
| 137     (r'common_constants\.lib$', r'chrome_switches\.obj$'), | 138     (r'common_constants\.lib$', r'chrome_switches\.obj$'), | 
| 138     (r'common_constants\.lib$', r'pref_names\.obj$'), | 139     (r'common_constants\.lib$', r'pref_names\.obj$'), | 
| (...skipping 17 matching lines...) Expand all  Loading... | 
| 156     (r'\bui\.lib$', r'ui_base_switches\.obj$'), | 157     (r'\bui\.lib$', r'ui_base_switches\.obj$'), | 
| 157     (r'webkit.*plugins_common\.lib$', r'plugin_switches\.obj$'), | 158     (r'webkit.*plugins_common\.lib$', r'plugin_switches\.obj$'), | 
| 158     (r'webkit.*plugins_common\.lib$', r'plugin_constants'), | 159     (r'webkit.*plugins_common\.lib$', r'plugin_constants'), | 
| 159     (r'webkit.*storage\.lib$', r'file_permission_policy\.obj$'), | 160     (r'webkit.*storage\.lib$', r'file_permission_policy\.obj$'), | 
| 160   ], | 161   ], | 
| 161 | 162 | 
| 162   # This manifest will be merged with the intermediate one from the linker, | 163   # This manifest will be merged with the intermediate one from the linker, | 
| 163   # and embedded in both DLLs. | 164   # and embedded in both DLLs. | 
| 164   'manifest': '..\\..\\chrome\\app\\chrome.dll.manifest' | 165   'manifest': '..\\..\\chrome\\app\\chrome.dll.manifest' | 
| 165 } | 166 } | 
| OLD | NEW | 
|---|