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

Unified Diff: net/net.gyp

Issue 10830183: Built crypto and crypto_unittests for iOS (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address code review. Created 8 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
« crypto/crypto.gyp ('K') | « crypto/run_all_unittests.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index fc277b86bd8ce5f6bde9489fec23760ea3cdc2a4..603d00c1f9c6a6b2d3c45ee9829d3c5f2565b4d1 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -37,6 +37,7 @@
'../base/base.gyp:base_i18n',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../build/temp_gyp/googleurl.gyp:googleurl',
+ '../crypto/crypto.gyp:crypto',
'../sdch/sdch.gyp:sdch',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
@@ -808,9 +809,6 @@
'conditions': [
['OS != "ios"', {
'dependencies': [
- # TODO(ios): This is temporary; Move this back to the main
- # dependencies section once crypto builds for iOS.
- '../crypto/crypto.gyp:crypto',
# The v8 gyp file is not available in the iOS tree.
'../v8/tools/gyp/v8.gyp:v8',
],
« crypto/crypto.gyp ('K') | « crypto/run_all_unittests.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698