Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'version_py': '<(DEPTH)/build/util/version.py', | 3 'version_py': '<(DEPTH)/build/util/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 'targets': [ | 17 'targets': [ |
| 18 { | 18 { |
| 19 # A target that is outdated if any of the mini_installer test sources | |
| 20 # are modified. | |
| 21 'target_name': 'test_installer_sentinel', | |
| 22 'type': 'none', | |
| 23 'actions': [ | |
| 24 { | |
| 25 'action_name': 'touch_sentinel', | |
| 26 'variables': { | |
| 27 'touch_sentinel_py': '../tools/build/win/touch_sentinel.py', | |
| 28 }, | |
| 29 'inputs': [ | |
| 30 '<(touch_sentinel_py)', | |
| 31 '../tools/build/list_test_installer_sources.py', | |
| 32 '<!@pymod_do_main(list_test_installer_sources ../test/mini_insta ller)', | |
|
brettw
2015/02/23 18:25:21
I don't think we should be doing filesystem operat
| |
| 33 ], | |
| 34 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/installer/test_inst aller_sentinel'], | |
| 35 'action': ['python', '<(touch_sentinel_py)', '<@(_outputs)'], | |
| 36 }, | |
| 37 ], | |
| 38 }, | |
| 39 { | |
| 19 'target_name': 'mini_installer', | 40 'target_name': 'mini_installer', |
| 20 'type': 'executable', | 41 'type': 'executable', |
| 21 | 42 |
| 22 'dependencies': [ | 43 'dependencies': [ |
| 23 '../chrome.gyp:chrome', | 44 '../chrome.gyp:chrome', |
| 24 '../chrome.gyp:chrome_nacl_win64', | 45 '../chrome.gyp:chrome_nacl_win64', |
| 25 '../chrome.gyp:chrome_dll', | 46 '../chrome.gyp:chrome_dll', |
| 26 '../chrome.gyp:default_extensions', | 47 '../chrome.gyp:default_extensions', |
| 27 '../chrome.gyp:setup', | 48 '../chrome.gyp:setup', |
| 49 'test_installer_sentinel', | |
| 28 ], | 50 ], |
| 29 'include_dirs': [ | 51 'include_dirs': [ |
| 30 '../..', | 52 '../..', |
| 31 '<(INTERMEDIATE_DIR)', | 53 '<(INTERMEDIATE_DIR)', |
| 32 '<(SHARED_INTERMEDIATE_DIR)/chrome', | 54 '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 33 ], | 55 ], |
| 34 'sources': [ | 56 'sources': [ |
| 35 '<(INTERMEDIATE_DIR)/packed_files.rc', | 57 '<(INTERMEDIATE_DIR)/packed_files.rc', |
| 36 'mini_installer/appid.h', | 58 'mini_installer/appid.h', |
| 37 'mini_installer/chrome.release', | 59 'mini_installer/chrome.release', |
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 317 'variables': { | 339 'variables': { |
| 318 'branding_dir': '../app/theme/google_chrome', | 340 'branding_dir': '../app/theme/google_chrome', |
| 319 }, | 341 }, |
| 320 }, { # else branding!="Chrome" | 342 }, { # else branding!="Chrome" |
| 321 'variables': { | 343 'variables': { |
| 322 'branding_dir': '../app/theme/chromium', | 344 'branding_dir': '../app/theme/chromium', |
| 323 }, | 345 }, |
| 324 }], | 346 }], |
| 325 ], | 347 ], |
| 326 } | 348 } |
| OLD | NEW |