Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/protobuf/protobuf.gyp

Issue 14597007: Support target/host architecture with ninja iOS builds (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 7 years, 7 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
« breakpad/breakpad.gyp ('K') | « third_party/mach_override/mach_override.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/protobuf.gyp
diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp
index 772bc1060e329ba4014f2aa7e26574b3f9d08f10..df0f6e5b2f64a6e371e5c4a1be150c361e0e62c2 100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -28,7 +28,7 @@
],
},
}],
- ['OS=="ios"', {
+ ['OS=="ios" and "<(GENERATOR)"!="ninja"', {
'variables': {
'ninja_output_dir': 'ninja-protoc',
'ninja_product_dir':
@@ -205,7 +205,7 @@
{
'target_name': 'protoc',
'conditions': [
- ['OS!="ios"', {
+ ['OS!="ios" or "<(GENERATOR)"=="ninja"', {
'type': 'executable',
'toolsets': ['host'],
'sources': [
@@ -273,7 +273,7 @@
'<(config_h_dir)',
'src/src',
],
- }, { # else, OS=="ios"
+ }, { # else, OS=="ios" and "<(GENERATOR)"!="ninja"
'type': 'none',
'dependencies': [
'compile_protoc',
« breakpad/breakpad.gyp ('K') | « third_party/mach_override/mach_override.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698