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

Unified Diff: third_party/libevent/libevent.gyp

Issue 118583003: gyps! and builds! Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 | « content/app/android/child_process_service.h ('k') | third_party/mach_override/mach_override.gyp » ('j') | 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 a785d34695fa2c4d280d771939489883ae97b454..413e7272011aede49ea4a9ddd31c24afc6119108 100644
--- a/third_party/libevent/libevent.gyp
+++ b/third_party/libevent/libevent.gyp
@@ -31,7 +31,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" or (OS == "android" and _toolset == "host")', {
+ [ 'OS == "linux" or (host_os == "linux" and _toolset == "host")', {
'sources': [ 'epoll.c' ],
'include_dirs': [ 'linux' ],
'link_settings': {
@@ -47,7 +47,7 @@
'sources': [ 'epoll.c' ],
'include_dirs': [ 'android' ],
}],
- [ 'OS == "mac" or OS == "ios" or os_bsd==1', {
+ [ 'OS == "mac" or OS == "ios" or os_bsd==1 or(host_os=="mac" and _toolset=="host")', {
'sources': [ 'kqueue.c' ],
'include_dirs': [ 'mac' ]
}],
« no previous file with comments | « content/app/android/child_process_service.h ('k') | third_party/mach_override/mach_override.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698