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': '<(DEPTH)/build/util/LASTCHANGE', | 5 'lastchange_path': '<(DEPTH)/build/util/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 'msvs_use_common_release': 0, | 7 'msvs_use_common_release': 0, |
8 'msvs_use_common_linker_extras': 0, | 8 'msvs_use_common_linker_extras': 0, |
9 'mini_installer_internal_deps%': 0, | 9 'mini_installer_internal_deps%': 0, |
10 'mini_installer_official_deps%': 0, | 10 'mini_installer_official_deps%': 0, |
11 }, | 11 }, |
12 'includes': [ | 12 'includes': [ |
13 '../../build/win_precompile.gypi', | 13 '../../build/win_precompile.gypi', |
14 ], | 14 ], |
15 'conditions': [ | 15 'conditions': [ |
16 ['OS=="win"', { | 16 ['OS=="win"', { |
17 'target_defaults': { | 17 'target_defaults': { |
18 'dependencies': [ | 18 'dependencies': [ |
| 19 '../chrome.gyp:app_host', |
19 '../chrome.gyp:chrome', | 20 '../chrome.gyp:chrome', |
20 '../chrome.gyp:chrome_nacl_win64', | 21 '../chrome.gyp:chrome_nacl_win64', |
21 '../chrome.gyp:chrome_dll', | 22 '../chrome.gyp:chrome_dll', |
22 '../chrome.gyp:default_extensions', | 23 '../chrome.gyp:default_extensions', |
23 '../chrome.gyp:setup', | 24 '../chrome.gyp:setup', |
24 ], | 25 ], |
25 'include_dirs': [ | 26 'include_dirs': [ |
26 '../..', | 27 '../..', |
27 '<(INTERMEDIATE_DIR)', | 28 '<(INTERMEDIATE_DIR)', |
28 '<(SHARED_INTERMEDIATE_DIR)/chrome', | 29 '<(SHARED_INTERMEDIATE_DIR)/chrome', |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 'inputs!': [ | 228 'inputs!': [ |
228 '<(PRODUCT_DIR)/nacl64.exe', | 229 '<(PRODUCT_DIR)/nacl64.exe', |
229 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', | 230 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', |
230 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 231 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
231 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 232 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
232 ], | 233 ], |
233 }], | 234 }], |
234 ], | 235 ], |
235 'inputs': [ | 236 'inputs': [ |
236 '<(create_installer_archive_py_path)', | 237 '<(create_installer_archive_py_path)', |
| 238 '<(PRODUCT_DIR)/app_host.exe', |
237 '<(PRODUCT_DIR)/chrome.exe', | 239 '<(PRODUCT_DIR)/chrome.exe', |
238 '<(PRODUCT_DIR)/chrome.dll', | 240 '<(PRODUCT_DIR)/chrome.dll', |
239 '<(PRODUCT_DIR)/nacl64.exe', | 241 '<(PRODUCT_DIR)/nacl64.exe', |
240 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', | 242 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', |
241 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 243 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
242 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 244 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
243 '<(PRODUCT_DIR)/locales/en-US.pak', | 245 '<(PRODUCT_DIR)/locales/en-US.pak', |
244 '<(PRODUCT_DIR)/icudt.dll', | 246 '<(PRODUCT_DIR)/icudt.dll', |
245 ], | 247 ], |
246 'outputs': [ | 248 'outputs': [ |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
285 'variables': { | 287 'variables': { |
286 'branding_dir': '../app/theme/google_chrome', | 288 'branding_dir': '../app/theme/google_chrome', |
287 }, | 289 }, |
288 }, { # else branding!="Chrome" | 290 }, { # else branding!="Chrome" |
289 'variables': { | 291 'variables': { |
290 'branding_dir': '../app/theme/chromium', | 292 'branding_dir': '../app/theme/chromium', |
291 }, | 293 }, |
292 }], | 294 }], |
293 ], | 295 ], |
294 } | 296 } |
OLD | NEW |