diff options
| author | John Abd-El-Malek <jam@chromium.org> | 2015-05-20 22:02:35 -0700 |
|---|---|---|
| committer | John Abd-El-Malek <jam@chromium.org> | 2015-05-21 05:05:53 +0000 |
| commit | 574ab3817e7220ba7a60c3f44f504c92b6f92710 (patch) | |
| tree | c8b469cd17da2a8e0bd2dd9a1d6afb9496e16626 /mojo | |
| parent | 1bd9da921215cca875ec3610db0976ac7ed9909a (diff) | |
| download | chromium_src-574ab3817e7220ba7a60c3f44f504c92b6f92710.zip chromium_src-574ab3817e7220ba7a60c3f44f504c92b6f92710.tar.gz chromium_src-574ab3817e7220ba7a60c3f44f504c92b6f92710.tar.bz2 | |
Fix ios build
BUG=481153,157073
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/1144413003
Cr-Commit-Position: refs/heads/master@{#330903}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/mojo_services.gyp | 5 | ||||
| -rw-r--r-- | mojo/services/network/xcode_hack.c | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/mojo/mojo_services.gyp b/mojo/mojo_services.gyp index 38f7178..c085642 100644 --- a/mojo/mojo_services.gyp +++ b/mojo/mojo_services.gyp @@ -27,6 +27,11 @@ }, 'includes': [ '../third_party/mojo/mojom_bindings_generator_explicit.gypi', + ],
+ 'sources': [
+ # XCode doesn't want to link a target without a source file. So add a
+ # dummy file keep the linker happy. See http://crbug.com/157073
+ 'services/network/xcode_hack.c',
], }], } diff --git a/mojo/services/network/xcode_hack.c b/mojo/services/network/xcode_hack.c new file mode 100644 index 0000000..ee0b615 --- /dev/null +++ b/mojo/services/network/xcode_hack.c @@ -0,0 +1,10 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// XCode doesn't want to link a pure assembly target and will fail +// to link when it creates an empty file list. So add a dummy file +// keep the linker happy. See http://crbug.com/157073 +int xcode_sucks() { + return 0; +} |