diff options
| author | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-06 11:04:46 +0000 |
|---|---|---|
| committer | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-06 11:04:46 +0000 |
| commit | b78edef67d54a9bbc3fd68a38c041595ea102717 (patch) | |
| tree | ffc146fee7877a1af9635f44534e41316fc34fce /third_party/libevent | |
| parent | 6c3e357ac3938a6a08069ef4533b5977113a763f (diff) | |
| download | chromium_src-b78edef67d54a9bbc3fd68a38c041595ea102717.zip chromium_src-b78edef67d54a9bbc3fd68a38c041595ea102717.tar.gz chromium_src-b78edef67d54a9bbc3fd68a38c041595ea102717.tar.bz2 | |
Fix Clang compilation error on Android in libevent.gyp.
This is part of Chrome for Android upstreaming.
This fixes the following issue we encountered downstream recently due to 'base'
being built for both the host and target but without distinguishing the
compilation flags properly:
third_party/libevent/http.c:561:6: error: implicitly declaring library function 'strlcpy' with type 'unsigned long (char *, const char *, unsigned long)' [-Werror]
Review URL: https://chromiumcodereview.appspot.com/10912095
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155164 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libevent')
| -rw-r--r-- | third_party/libevent/libevent.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/libevent/libevent.gyp b/third_party/libevent/libevent.gyp index bfb7f56..0f8c31c 100644 --- a/third_party/libevent/libevent.gyp +++ b/third_party/libevent/libevent.gyp @@ -36,7 +36,7 @@ # libevent has platform-specific implementation files. Since its # native build uses autoconf, platform-specific config.h files are # provided and live in platform-specific directories. - [ 'OS == "linux"', { + [ 'OS == "linux" or (OS == "android" and _toolset == "host")', { 'sources': [ 'epoll.c', 'epoll_sub.c' ], 'include_dirs': [ 'linux' ], 'link_settings': { @@ -47,7 +47,7 @@ ], }, }], - [ 'OS == "android"', { + [ 'OS == "android" and _toolset == "target"', { # On android, epoll_create(), epoll_ctl(), epoll_wait() and # clock_gettime() are all in libc.so, so no need to add # epoll_sub.c and link librt. |