diff options
| author | jam <jam@chromium.org> | 2015-02-10 10:49:54 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-10 18:50:28 +0000 |
| commit | 82dd46ca8cdeacf7f0ba4759062901072f2b0429 (patch) | |
| tree | f44a89cf563ce693eb4b7c6de1f7c9374e831992 | |
| parent | 44157c0b0ef9d03d474529ffae4c14b443e141fc (diff) | |
| download | chromium_src-82dd46ca8cdeacf7f0ba4759062901072f2b0429.zip chromium_src-82dd46ca8cdeacf7f0ba4759062901072f2b0429.tar.gz chromium_src-82dd46ca8cdeacf7f0ba4759062901072f2b0429.tar.bz2 | |
Fix analyze step on ios_rel_device bots.
BUG=454416
Review URL: https://codereview.chromium.org/916433002
Cr-Commit-Position: refs/heads/master@{#315600}
| -rw-r--r-- | build/all.gyp | 1 | ||||
| -rw-r--r-- | testing/iossim/iossim.gyp | 1 | ||||
| -rw-r--r-- | third_party/protobuf/protobuf.gyp | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index dea7e59..20db7d5 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -59,7 +59,6 @@ '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittests', '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_environment_unittests', - '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_perftests', '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_unittests', '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittests', '../third_party/mojo/mojo_edk_tests.gyp:mojo_system_unittests', diff --git a/testing/iossim/iossim.gyp b/testing/iossim/iossim.gyp index a8ad603..6a1fb02 100644 --- a/testing/iossim/iossim.gyp +++ b/testing/iossim/iossim.gyp @@ -136,6 +136,7 @@ { 'target_name': 'iossim', 'type': 'none', + 'toolsets': ['host'], 'variables': { # Gyp to rerun 're_run_targets': [ diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp index 4e1610e..25ddbae 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', ], |