build/common.gypi - Issue 257029: Add an option to disable NaCl at compile time for platforms where it doesn't build yet

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 257029: Add an option to disable NaCl at compile time for platforms where it doesn't build yet (Closed)

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

Index: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index 37526e24c813fb8e5ca946ef7734d820ab841e16..d1dfc6561d028f86a00a34476b5b7298fd142ff8 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -154,6 +154,10 @@

# Set to select the Title Case versions of strings in GRD files.

'use_titlecase_in_grd_files%': 0,

+ # Used to disable Native Client at compile time, for platforms where it

+ # isn't supported

+ 'disable_nacl%': 0,

'conditions': [

['OS=="linux"', {

'conditions': [

@@ -847,6 +851,13 @@

}],

+ ['disable_nacl==1', {

+ 'target_defaults': {

+ 'defines': [

+ 'DISABLE_NACL',

+ ],

+ },

+ }],

['msvs_use_common_linker_extras', {

'target_defaults': {

'msvs_settings': {

« no previous file with comments | « no previous file | chrome/app/chrome_dll_main.cc » ('j') | no next file with comments »