chrome/chrome.gyp - Issue 1114453002: use 'branding_path_component' to simplify branding in chrome directory - part 2

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.gyp

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

Patch Set: 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.gyp

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp

index 46108eedf7e72761cbc0e7a4d56eec1025712f58..7a6b421315f8a8f95c526efd1333099df276a732 100644

--- a/chrome/chrome.gyp

+++ b/chrome/chrome.gyp

@@ -76,15 +76,8 @@

['OS=="linux"', {

'conditions': [

['chromeos==1', {

- 'conditions': [

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

- 'platform_locale_settings_grd':

- 'app/resources/locale_settings_google_chromeos.grd',

- }, { # branding!=Chrome

- 'platform_locale_settings_grd':

- 'app/resources/locale_settings_chromiumos.grd',

- }],

- ]

+ 'platform_locale_settings_grd':

+ 'app/resources/locale_settings_<(branding_path_component)os.grd',

}, { # chromeos==0

'platform_locale_settings_grd':

'app/resources/locale_settings_linux.grd',

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