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

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

Issue 2067018: Break gyp cycles on Linux. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: remove duplicate vars Created 10 years, 7 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
OLDNEW
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 '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 }, 9 },
10 'conditions': [ 10 'conditions': [
11 ['OS=="win"', { 11 ['OS=="win"', {
12 'target_defaults': { 12 'target_defaults': {
13 'dependencies': [ 13 'dependencies': [
14 '../chrome.gyp:chrome', 14 '../chrome.gyp:chrome',
15 '../chrome.gyp:chrome_nacl_win64', 15 '../chrome.gyp:chrome_nacl_win64',
16 '../chrome.gyp:chrome_dll', 16 '../chrome.gyp:chrome_dll',
17 '../chrome.gyp:default_extensions', 17 '../chrome.gyp:default_extensions',
18 'installer.gyp:setup', 18 '../chrome.gyp:setup',
19 ], 19 ],
20 'include_dirs': [ 20 'include_dirs': [
21 '../..', 21 '../..',
22 '<(PRODUCT_DIR)', 22 '<(PRODUCT_DIR)',
23 '<(INTERMEDIATE_DIR)', 23 '<(INTERMEDIATE_DIR)',
24 '<(SHARED_INTERMEDIATE_DIR)/chrome', 24 '<(SHARED_INTERMEDIATE_DIR)/chrome',
25 ], 25 ],
26 'sources': [ 26 'sources': [
27 'mini_installer/appid.h', 27 'mini_installer/appid.h',
28 'mini_installer/mini_installer.cc', 28 'mini_installer/mini_installer.cc',
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 }, 269 },
270 }], 270 }],
271 ], 271 ],
272 } 272 }
273 273
274 # Local Variables: 274 # Local Variables:
275 # tab-width:2 275 # tab-width:2
276 # indent-tabs-mode:nil 276 # indent-tabs-mode:nil
277 # End: 277 # End:
278 # vim: set expandtab tabstop=2 shiftwidth=2: 278 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/installer/installer_util.gypi ('k') | chrome/test/interactive_ui/interactive_ui_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698