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

Unified Diff: ipc/ipc.gyp

Issue 1321253011: Remove dependency on //crypto in //ipc, except on windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fallback_clean
Patch Set: Created 5 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 | « ipc/handle_attachment_win.cc ('k') | ipc/ipc_channel_reader_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc.gyp
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index fb64c329e314e265d65f4bc16c9f772ed3a9285b..5ae3eba169ce09ef6a194385471b8860034056db 100644
--- a/ipc/ipc.gyp
+++ b/ipc/ipc.gyp
@@ -20,7 +20,6 @@
'../base/base.gyp:base',
# TODO(viettrungluu): Needed for base/lazy_instance.h, which is suspect.
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '../crypto/crypto.gyp:crypto',
],
# TODO(gregoryd): direct_dependent_settings should be shared with the
# 64-bit target, but it doesn't work due to a bug in gyp
@@ -29,6 +28,13 @@
'..',
],
},
+ 'conditions': [
+ ['OS == "win"', {
+ 'dependencies': [
+ '../crypto/crypto.gyp:crypto',
+ ],
+ }],
+ ],
},
{
'target_name': 'ipc_tests',
@@ -39,6 +45,7 @@
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
+ '../crypto/crypto.gyp:crypto',
'../testing/gtest.gyp:gtest',
],
'include_dirs': [
« no previous file with comments | « ipc/handle_attachment_win.cc ('k') | ipc/ipc_channel_reader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698