build/common.gypi - Issue 659513004: Non-SFI Mode: Build base/ library by PNaCL toolchain for nacl_helper_nonsfi.

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 659513004: Non-SFI Mode: Build base/ library by PNaCL toolchain for nacl_helper_nonsfi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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: build/common.gypi

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

index 7541519ea06784b5b3df681b94036e6def536f92..8aa9e6b05eec270f2f167ea0b228f92272b9e212 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -2557,9 +2557,6 @@

['use_cras==1', {

'defines': ['USE_CRAS=1'],

}],

- ['use_glib==1', {

- 'defines': ['USE_GLIB=1'],

- }],

['use_ozone==1', {

'defines': ['USE_OZONE=1'],

}],

@@ -2918,6 +2915,9 @@

'USE_OPENSSL_CERTS=1',

}],

+ ['<(use_glib)==1 and >(nacl_untrusted_build)==0', {

+ 'defines': ['USE_GLIB=1'],

+ }],

['<(use_nss)==1 and >(nacl_untrusted_build)==0', {

'defines': ['USE_NSS=1'],

}],

« base/base_nacl.gyp ('K') | « base/process/kill_posix.cc ('k') | components/nacl_nonsfi.gyp » ('j') | no next file with comments »