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

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

Issue 206006: Force inclusion of build/common.gypi for all chromium gyp files. (Closed)
Patch Set: 2nd round of feedback Created 11 years, 3 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 'includes': [
11 '../../build/common.gypi',
12 ],
13 'conditions': [ 10 'conditions': [
14 ['OS=="win"', { 11 ['OS=="win"', {
15 'targets': [ 12 'targets': [
16 { 13 {
17 'target_name': 'mini_installer', 14 'target_name': 'mini_installer',
18 'type': 'executable', 15 'type': 'executable',
19 'msvs_guid': '24A5AC7C-280B-4899-9153-6BA570A081E7', 16 'msvs_guid': '24A5AC7C-280B-4899-9153-6BA570A081E7',
20 'dependencies': [ 17 'dependencies': [
21 '../../app/app.gyp:app_id', 18 '../../app/app.gyp:app_id',
22 '../chrome.gyp:chrome', 19 '../chrome.gyp:chrome',
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 'variables': { 204 'variables': {
208 'branding_dir': '../app/theme/google_chrome', 205 'branding_dir': '../app/theme/google_chrome',
209 }, 206 },
210 }, { # else branding!="Chrome" 207 }, { # else branding!="Chrome"
211 'variables': { 208 'variables': {
212 'branding_dir': '../app/theme/chromium', 209 'branding_dir': '../app/theme/chromium',
213 }, 210 },
214 }], 211 }],
215 ], 212 ],
216 } 213 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698