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

Unified Diff: third_party/libevent/libevent.gyp

Issue 10912095: Fix Clang compilation error on Android in libevent.gyp. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libevent/libevent.gyp
diff --git a/third_party/libevent/libevent.gyp b/third_party/libevent/libevent.gyp
index bfb7f563930f62badb531b004b2a1789af33819c..0f8c31c023dcc85149f11ca035311fcfee309022 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.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698