build/all.gyp - Issue 839143002: Roll Chrome into Mojo.

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

Issue 839143002: Roll Chrome into Mojo. (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Rebase Created 5 years, 11 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/all.gyp

diff --git a/build/all.gyp b/build/all.gyp

index 1b3b9a9796a3ce2d0841758327df10ead4b5498e..04e67c332577031836eb1ea04f43f671ccab767e 100644

--- a/build/all.gyp

+++ b/build/all.gyp

@@ -475,7 +475,7 @@

}],

['disable_nacl==0 and disable_nacl_untrusted==0', {

'dependencies': [

- '../mojo/mojo_nacl.gyp:mojo_nacl',

+ '../mojo/mojo_nacl_untrusted.gyp:libmojo',

'../mojo/mojo_nacl.gyp:monacl_codegen',

'../mojo/mojo_nacl.gyp:monacl_sel',

'../mojo/mojo_nacl.gyp:monacl_shell',

« no previous file with comments | « base/values_unittest.cc ('k') | build/android/findbugs_filter/findbugs_known_bugs.txt » ('j') | no next file with comments »