chrome/chrome_exe.gypi - Issue 1090213002: optimize branding - use branding_path_component variable for defining pranding specific paths

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_exe.gypi

Issue 1090213002: optimize branding - use branding_path_component variable for defining pranding specific paths (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed conditional branding 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_exe.gypi

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

index 6c3c0ba105c29df2c66270121b20ee315dbcf7f9..11a42f3d11878463318fa39652296739218ea6d0 100644

--- a/chrome/chrome_exe.gypi

+++ b/chrome/chrome_exe.gypi

@@ -316,18 +316,8 @@

# Unique dir to write to so the [lang].lproj/InfoPlist.strings

# for the main app and the helper app don't name collide.

'output_path': '<(INTERMEDIATE_DIR)/app_infoplist_strings',

+ 'branding_name': '<(branding_path_component)_strings',

- 'conditions': [

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

- 'variables': {

- 'branding_name': 'google_chrome_strings',

- },

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

- 'variables': {

- 'branding_name': 'chromium_strings',

- },

- }],

- ],

'inputs': [

'<(tool_path)',

'<(version_path)',

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