chrome/installer/installer.gyp - Issue 206006: Force inclusion of build/common.gypi for all chromium gyp files.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/installer/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

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': '<(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 },	7 },

8 'includes': [

9 '../../build/common.gypi',

10 ],

11 'conditions': [	8 'conditions': [

12 ['OS=="win"', {	9 ['OS=="win"', {

13 'targets': [	10 'targets': [

14 {	11 {

15 'target_name': 'installer_util',	12 'target_name': 'installer_util',

16 'type': '<(library)',	13 'type': '<(library)',

17 'msvs_guid': 'EFBB1436-A63F-4CD8-9E99-B89226E782EC',	14 'msvs_guid': 'EFBB1436-A63F-4CD8-9E99-B89226E782EC',

18 'dependencies': [	15 'dependencies': [

19 '../../app/app.gyp:app_id',	16 '../../app/app.gyp:app_id',

20 'installer_util_strings',	17 'installer_util_strings',

(...skipping 613 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
634 'variables': {	631 'variables': {

635 'branding_dir': '../app/theme/google_chrome',	632 'branding_dir': '../app/theme/google_chrome',

636 },	633 },

637 }, { # else branding!="Chrome"	634 }, { # else branding!="Chrome"

638 'variables': {	635 'variables': {

639 'branding_dir': '../app/theme/chromium',	636 'branding_dir': '../app/theme/chromium',

640 },	637 },

641 }],	638 }],

642 ],	639 ],

643 }	640 }

OLD	NEW

« build/common.gypi ('K') | « chrome/chrome.gyp ('k') | chrome/installer/mini_installer.gyp » ('j') | o3d/DEPS_gyp » ('J')