chrome/chrome_common.gypi - Issue 1104023002: use 'branding_path_component' to simplify branding in chrome directory - part 1

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

Unified Diff: chrome/chrome_common.gypi

Issue 1104023002: use 'branding_path_component' to simplify branding in chrome directory - part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: try to fix build Created 5 years, 8 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 side-by-side diff with in-line comments

Download patch

Index: chrome/chrome_common.gypi

diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi

index 2f23a8f78c008126123a18eab25f6b75c1dc8859..b792d4024c1dbaf34857eff6d785fd28b3338c6f 100644

--- a/chrome/chrome_common.gypi

+++ b/chrome/chrome_common.gypi

@@ -561,20 +561,8 @@

'version_py_path': '<(DEPTH)/build/util/version.py',

'version_path': 'VERSION',

'template_input_path': 'common/chrome_version_info_values.h.version',

+ 'branding_path': 'app/theme/<(branding_path_component)/BRANDING',

- 'conditions': [

- [ 'branding == "Chrome"', {

- 'variables': {

- 'branding_path':

- 'app/theme/google_chrome/BRANDING',

- },

- }, { # else branding!="Chrome"

- 'variables': {

- 'branding_path':

- 'app/theme/chromium/BRANDING',

- },

- }],

- ],

'inputs': [

'<(template_input_path)',

'<(version_path)',

« no previous file with comments | « no previous file | chrome/chrome_exe.gypi » ('j') | no next file with comments »