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

Unified Diff: third_party/libevent/libevent_nacl_nonsfi.gyp

Issue 681713002: Update from chromium https://crrev.com/301315 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 2 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 | « third_party/libevent/BUILD.gn ('k') | third_party/mesa/mesa.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libevent/libevent_nacl_nonsfi.gyp
diff --git a/third_party/libevent/libevent_nacl_nonsfi.gyp b/third_party/libevent/libevent_nacl_nonsfi.gyp
index 8638c961a0e3f884e174ab0d44fe81a57172f333..704de1054b1011a47f31d0b07b6ee4a11c80c975 100644
--- a/third_party/libevent/libevent_nacl_nonsfi.gyp
+++ b/third_party/libevent/libevent_nacl_nonsfi.gyp
@@ -7,7 +7,7 @@
'../../build/common_untrusted.gypi',
],
'conditions': [
- ['disable_nacl==0', {
+ ['disable_nacl==0 and disable_nacl_untrusted==0', {
'targets': [
{
'target_name': 'event_nacl_nonsfi',
@@ -28,11 +28,10 @@
'defines': [
'HAVE_CONFIG_H',
],
+ 'include_dirs': [
+ 'nacl_nonsfi',
+ ],
'variables': {
- 'include_dirs': [
- 'nacl_nonsfi',
- '<(DEPTH)/native_client/src/public/linux_syscalls',
- ],
'nacl_untrusted_build': 1,
'nlib_target': 'libevent_nacl_nonsfi.a',
'build_glibc': 0,
@@ -42,7 +41,7 @@
'build_nonsfi_helper': 1,
},
'dependencies': [
- '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+ '../../native_client/tools.gyp:prep_toolchain',
],
},
],
« no previous file with comments | « third_party/libevent/BUILD.gn ('k') | third_party/mesa/mesa.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698