diff options
| author | justincohen@google.com <justincohen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 21:29:47 +0000 |
|---|---|---|
| committer | justincohen@google.com <justincohen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 21:29:47 +0000 |
| commit | 296bc450e8c62ba8bddd4a67e4cb3e89648f99a2 (patch) | |
| tree | c63ce9762f156e999a18a013bd4d07c265eab68f /third_party | |
| parent | 5f745718ff8052fb22fd411cd9202d04d9afdb06 (diff) | |
| download | chromium_src-296bc450e8c62ba8bddd4a67e4cb3e89648f99a2.zip chromium_src-296bc450e8c62ba8bddd4a67e4cb3e89648f99a2.tar.gz chromium_src-296bc450e8c62ba8bddd4a67e4cb3e89648f99a2.tar.bz2 | |
Support target/host architecture with ninja iOS builds
When iOS builds support ninja and enable GYP_CROSSCOMPILE=1, ninja
will build breakpad, protoc and iossim using host arch instead
of the sub-out-ninja workaround.
TBR=mark@chromium.org
BUG=236517
Review URL: https://chromiumcodereview.appspot.com/14597007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199827 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/mach_override/mach_override.gyp | 2 | ||||
| -rw-r--r-- | third_party/protobuf/protobuf.gyp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/third_party/mach_override/mach_override.gyp b/third_party/mach_override/mach_override.gyp index 8b5e0ba..720e757 100644 --- a/third_party/mach_override/mach_override.gyp +++ b/third_party/mach_override/mach_override.gyp @@ -6,7 +6,7 @@ 'targets': [ ], 'conditions': [ - ['OS=="mac"', { + ['OS=="mac" or (OS=="ios" and "<(GENERATOR)"=="ninja")', { 'targets' : [ { 'target_name' : 'mach_override', diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp index 772bc10..df0f6e5 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', |