Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(293)

Side by Side Diff: chrome/installer/mini_installer.gyp

Issue 935913002: Make changes to mini_installer test files trigger tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: explicit file list Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/test/mini_installer/test_installer.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 'includes': [
18 '../test/mini_installer/test_installer.gypi',
19 ],
17 'targets': [ 20 'targets': [
18 { 21 {
22 # A target that is outdated if any of the mini_installer test sources
23 # are modified.
24 'target_name': 'test_installer_sentinel',
25 'type': 'none',
26 'actions': [
27 {
28 'action_name': 'touch_sentinel',
29 'variables': {
30 'touch_sentinel_py': '../tools/build/win/touch_sentinel.py',
31 },
32 'inputs': [
33 '<@(test_installer_sources)', # from test_installer.gypi
34 '<(touch_sentinel_py)',
35 ],
36 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/installer/test_inst aller_sentinel'],
37 'action': ['python', '<(touch_sentinel_py)', '<@(_outputs)'],
38 },
39 ],
40 },
41 {
19 'target_name': 'mini_installer', 42 'target_name': 'mini_installer',
20 'type': 'executable', 43 'type': 'executable',
21 44
22 'dependencies': [ 45 'dependencies': [
23 '../chrome.gyp:chrome', 46 '../chrome.gyp:chrome',
24 '../chrome.gyp:chrome_nacl_win64', 47 '../chrome.gyp:chrome_nacl_win64',
25 '../chrome.gyp:chrome_dll', 48 '../chrome.gyp:chrome_dll',
26 '../chrome.gyp:default_extensions', 49 '../chrome.gyp:default_extensions',
27 '../chrome.gyp:setup', 50 '../chrome.gyp:setup',
51 'test_installer_sentinel',
28 ], 52 ],
29 'include_dirs': [ 53 'include_dirs': [
30 '../..', 54 '../..',
31 '<(INTERMEDIATE_DIR)', 55 '<(INTERMEDIATE_DIR)',
32 '<(SHARED_INTERMEDIATE_DIR)/chrome', 56 '<(SHARED_INTERMEDIATE_DIR)/chrome',
33 ], 57 ],
34 'sources': [ 58 'sources': [
35 '<(INTERMEDIATE_DIR)/packed_files.rc', 59 '<(INTERMEDIATE_DIR)/packed_files.rc',
36 'mini_installer/appid.h', 60 'mini_installer/appid.h',
37 'mini_installer/chrome.release', 61 'mini_installer/chrome.release',
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 'variables': { 341 'variables': {
318 'branding_dir': '../app/theme/google_chrome', 342 'branding_dir': '../app/theme/google_chrome',
319 }, 343 },
320 }, { # else branding!="Chrome" 344 }, { # else branding!="Chrome"
321 'variables': { 345 'variables': {
322 'branding_dir': '../app/theme/chromium', 346 'branding_dir': '../app/theme/chromium',
323 }, 347 },
324 }], 348 }],
325 ], 349 ],
326 } 350 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/mini_installer/test_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698