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

Side by Side 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: Add comment. 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 unified diff | Download patch
« no previous file with comments | « crypto/run_all_unittests.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 19 matching lines...) Expand all
30 'targets': [ 30 'targets': [
31 { 31 {
32 'target_name': 'net', 32 'target_name': 'net',
33 'type': '<(component)', 33 'type': '<(component)',
34 'variables': { 'enable_wexit_time_destructors': 1, }, 34 'variables': { 'enable_wexit_time_destructors': 1, },
35 'dependencies': [ 35 'dependencies': [
36 '../base/base.gyp:base', 36 '../base/base.gyp:base',
37 '../base/base.gyp:base_i18n', 37 '../base/base.gyp:base_i18n',
38 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 38 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
39 '../build/temp_gyp/googleurl.gyp:googleurl', 39 '../build/temp_gyp/googleurl.gyp:googleurl',
40 '../crypto/crypto.gyp:crypto',
40 '../sdch/sdch.gyp:sdch', 41 '../sdch/sdch.gyp:sdch',
41 '../third_party/icu/icu.gyp:icui18n', 42 '../third_party/icu/icu.gyp:icui18n',
42 '../third_party/icu/icu.gyp:icuuc', 43 '../third_party/icu/icu.gyp:icuuc',
43 '../third_party/zlib/zlib.gyp:zlib', 44 '../third_party/zlib/zlib.gyp:zlib',
44 'net_resources', 45 'net_resources',
45 ], 46 ],
46 'sources': [ 47 'sources': [
47 'android/net_jni_registrar.cc', 48 'android/net_jni_registrar.cc',
48 'android/net_jni_registrar.h', 49 'android/net_jni_registrar.h',
49 'android/network_change_notifier_android.cc', 50 'android/network_change_notifier_android.cc',
(...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 ], 805 ],
805 'defines': [ 806 'defines': [
806 'NET_IMPLEMENTATION', 807 'NET_IMPLEMENTATION',
807 ], 808 ],
808 'export_dependent_settings': [ 809 'export_dependent_settings': [
809 '../base/base.gyp:base', 810 '../base/base.gyp:base',
810 ], 811 ],
811 'conditions': [ 812 'conditions': [
812 ['OS != "ios"', { 813 ['OS != "ios"', {
813 'dependencies': [ 814 'dependencies': [
814 # TODO(ios): This is temporary; Move this back to the main
815 # dependencies section once crypto builds for iOS.
816 '../crypto/crypto.gyp:crypto',
817 # The v8 gyp file is not available in the iOS tree. 815 # The v8 gyp file is not available in the iOS tree.
818 '../v8/tools/gyp/v8.gyp:v8', 816 '../v8/tools/gyp/v8.gyp:v8',
819 ], 817 ],
820 }], 818 }],
821 ['chromeos==1', { 819 ['chromeos==1', {
822 'sources!': [ 820 'sources!': [
823 'base/network_change_notifier_linux.cc', 821 'base/network_change_notifier_linux.cc',
824 'base/network_change_notifier_linux.h', 822 'base/network_change_notifier_linux.h',
825 'base/network_change_notifier_netlink_linux.cc', 823 'base/network_change_notifier_netlink_linux.cc',
826 'base/network_change_notifier_netlink_linux.h', 824 'base/network_change_notifier_netlink_linux.h',
(...skipping 1240 matching lines...) Expand 10 before | Expand all | Expand 10 after
2067 '--result', '<@(_outputs)', 2065 '--result', '<@(_outputs)',
2068 '--isolate', 'net_unittests.isolate', 2066 '--isolate', 'net_unittests.isolate',
2069 ], 2067 ],
2070 }, 2068 },
2071 ], 2069 ],
2072 }, 2070 },
2073 ], 2071 ],
2074 }], 2072 }],
2075 ], 2073 ],
2076 } 2074 }
OLDNEW
« no previous file with comments | « crypto/run_all_unittests.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698