build/common.gypi - Issue 40066: Branding of Chrome.app....

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: build/common.gypi

Issue 40066: Branding of Chrome.app.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 years, 10 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:

Index: build/common.gypi

===================================================================

--- build/common.gypi (revision 10904)

+++ build/common.gypi (working copy)

@@ -5,11 +5,16 @@

{

'variables': {

'chromium_code%': 0,

+ 'branding%': 'Chromium',

'target_defaults': {

- # TODO(bradnelson): This should really be able to be either:

- # CHROMIUM_BUILD or GOOGLE_CHROME_BUILD

- 'defines': ['CHROMIUM_BUILD'],

+ 'conditions': [

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

+ 'defines': ['GOOGLE_CHROME_BUILD'],

+ }, { # else: branding!="Chrome"

+ 'defines': ['CHROMIUM_BUILD'],

+ }],

+ ],

'default_configuration': 'Debug',

'configurations': {

'Debug': {

« no previous file with comments | « no previous file | chrome/app/app-Info.plist » ('j') | no next file with comments »