third_party/protobuf/protobuf.gyp - Issue 1028333002: Chromium -> Mojo roll.

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 1028333002: Chromium -> Mojo roll. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 5 years, 9 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 25ddbae670173d419ad9d6fc151ebd2930c947e9..7417eecc8915165e77acbd30a01826fe14708122 100644

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

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

@@ -29,7 +29,7 @@

}],

- ['OS=="ios" and "<(GENERATOR)"!="ninja"', {

+ ['OS=="ios" and "<(GENERATOR)"=="xcode" and "<(GENERATOR_FLAVOR)"!="ninja"', {

'variables': {

'ninja_output_dir': 'ninja-protoc',

'ninja_product_dir':

@@ -170,7 +170,7 @@

{

'target_name': 'protoc',

'conditions': [

- ['OS!="ios" or "<(GENERATOR)"=="ninja"', {

+ ['OS!="ios" or "<(GENERATOR)"!="xcode" or "<(GENERATOR_FLAVOR)"=="ninja"', {

'type': 'executable',

'toolsets': ['host'],

'sources': [

@@ -238,7 +238,7 @@

'<(config_h_dir)',

'src/src',

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

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

'type': 'none',

'toolsets': ['host'],

'dependencies': [

« no previous file with comments | « third_party/ots/src/woff2.cc ('k') | third_party/qcms/README.chromium » ('j') | no next file with comments »