third_party/protobuf/protobuf.gyp - Issue 935333002: Update from https://crrev.com/316786

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: third_party/protobuf/protobuf.gyp

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 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: third_party/protobuf/protobuf.gyp

diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp

index 4e1610e143ed375094c366a255831874771aae38..25ddbae670173d419ad9d6fc151ebd2930c947e9 100644

--- a/third_party/protobuf/protobuf.gyp

+++ b/third_party/protobuf/protobuf.gyp

@@ -53,6 +53,7 @@

# normal protoc target under the condition that "OS==iOS".

'target_name': 'compile_protoc',

'type': 'none',

+ 'toolsets': ['host'],

'includes': ['../../build/ios/mac_build.gypi'],

'actions': [

{

@@ -239,6 +240,7 @@

}, { # else, OS=="ios" and "<(GENERATOR)"!="ninja"

'type': 'none',

+ 'toolsets': ['host'],

'dependencies': [

'compile_protoc',

« no previous file with comments | « third_party/mesa/mesa.gyp ('k') | third_party/qcms/README.chromium » ('j') | no next file with comments »