| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'version_py': '../../chrome/tools/build/version.py', | 3 'version_py': '../../chrome/tools/build/version.py', |
| 4 'version_path': '../../chrome/VERSION', | 4 'version_path': '../../chrome/VERSION', |
| 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', | 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', |
| 6 # 'branding_dir' is set in the 'conditions' section at the bottom. | 6 # 'branding_dir' is set in the 'conditions' section at the bottom. |
| 7 }, | 7 }, |
| 8 'includes': [ | 8 'includes': [ |
| 9 '../../build/common.gypi', | 9 '../../build/common.gypi', |
| 10 ], | 10 ], |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 ], | 169 ], |
| 170 'msvs_settings': { | 170 'msvs_settings': { |
| 171 'VCManifestTool': { | 171 'VCManifestTool': { |
| 172 'AdditionalManifestFiles': '$(ProjectDir)\\mini_installer\\mini_in
staller.exe.manifest', | 172 'AdditionalManifestFiles': '$(ProjectDir)\\mini_installer\\mini_in
staller.exe.manifest', |
| 173 }, | 173 }, |
| 174 }, | 174 }, |
| 175 }, | 175 }, |
| 176 { | 176 { |
| 177 'target_name': 'installer_util_strings', | 177 'target_name': 'installer_util_strings', |
| 178 'msvs_guid': '0026A376-C4F1-4575-A1BA-578C69F07013', | 178 'msvs_guid': '0026A376-C4F1-4575-A1BA-578C69F07013', |
| 179 # See hack in chrome.gyp:chrome_strings | 179 'type': 'none', |
| 180 'type': 'dummy_executable', | |
| 181 'rules': [ | 180 'rules': [ |
| 182 { | 181 { |
| 183 'rule_name': 'installer_util_strings', | 182 'rule_name': 'installer_util_strings', |
| 184 'extension': 'grd', | 183 'extension': 'grd', |
| 185 'inputs': [ | 184 'inputs': [ |
| 186 # Hardcoded for now. | 185 '<(RULE_INPUT_PATH)', |
| 187 '../app/generated_resources.grd', | |
| 188 ], | 186 ], |
| 189 'outputs': [ | 187 'outputs': [ |
| 190 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/<(RULE_INPUT_
ROOT).h', | 188 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/<(RULE_INPUT_
ROOT).h', |
| 191 ], | 189 ], |
| 192 'action': ['../../third_party/python_24/python.exe', | 190 'action': ['python', |
| 193 'util/prebuild/create_string_rc.py', | 191 'util/prebuild/create_string_rc.py', |
| 194 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings'], | 192 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings'], |
| 195 'message': 'Generating resources from <(RULE_INPUT_PATH)', | 193 'message': 'Generating resources from <(RULE_INPUT_PATH)', |
| 196 }, | 194 }, |
| 197 ], | 195 ], |
| 198 'sources': [ | 196 'sources': [ |
| 199 '../app/generated_resources.grd', | 197 '../app/generated_resources.grd', |
| 200 ], | 198 ], |
| 201 'direct_dependent_settings': { | 199 'direct_dependent_settings': { |
| 202 'include_dirs': [ | 200 'include_dirs': [ |
| (...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 620 'variables': { | 618 'variables': { |
| 621 'branding_dir': '../app/theme/google_chrome', | 619 'branding_dir': '../app/theme/google_chrome', |
| 622 }, | 620 }, |
| 623 }, { # else branding!="Chrome" | 621 }, { # else branding!="Chrome" |
| 624 'variables': { | 622 'variables': { |
| 625 'branding_dir': '../app/theme/chromium', | 623 'branding_dir': '../app/theme/chromium', |
| 626 }, | 624 }, |
| 627 }], | 625 }], |
| 628 ], | 626 ], |
| 629 } | 627 } |
| OLD | NEW |