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

Side by Side Diff: net/net.gyp

Issue 11316210: Implement TestRootCerts for Android (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: address Ryan's remarks Created 8 years 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 | « net/base/test_root_certs_android.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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 'base/sys_addrinfo.h', 268 'base/sys_addrinfo.h',
269 'base/tcp_listen_socket.cc', 269 'base/tcp_listen_socket.cc',
270 'base/tcp_listen_socket.h', 270 'base/tcp_listen_socket.h',
271 'base/test_data_stream.cc', 271 'base/test_data_stream.cc',
272 'base/test_data_stream.h', 272 'base/test_data_stream.h',
273 'base/test_root_certs.cc', 273 'base/test_root_certs.cc',
274 'base/test_root_certs.h', 274 'base/test_root_certs.h',
275 'base/test_root_certs_mac.cc', 275 'base/test_root_certs_mac.cc',
276 'base/test_root_certs_nss.cc', 276 'base/test_root_certs_nss.cc',
277 'base/test_root_certs_openssl.cc', 277 'base/test_root_certs_openssl.cc',
278 'base/test_root_certs_android.cc',
278 'base/test_root_certs_win.cc', 279 'base/test_root_certs_win.cc',
279 'base/transport_security_state.cc', 280 'base/transport_security_state.cc',
280 'base/transport_security_state.h', 281 'base/transport_security_state.h',
281 'base/transport_security_state_static.h', 282 'base/transport_security_state_static.h',
282 'base/unix_domain_socket_posix.cc', 283 'base/unix_domain_socket_posix.cc',
283 'base/unix_domain_socket_posix.h', 284 'base/unix_domain_socket_posix.h',
284 'base/upload_bytes_element_reader.cc', 285 'base/upload_bytes_element_reader.cc',
285 'base/upload_bytes_element_reader.h', 286 'base/upload_bytes_element_reader.h',
286 'base/upload_data.cc', 287 'base/upload_data.cc',
287 'base/upload_data.h', 288 'base/upload_data.h',
(...skipping 917 matching lines...) Expand 10 before | Expand all | Expand 10 after
1205 ], 1206 ],
1206 }], 1207 }],
1207 [ 'OS == "android"', { 1208 [ 'OS == "android"', {
1208 'dependencies': [ 1209 'dependencies': [
1209 '../third_party/openssl/openssl.gyp:openssl', 1210 '../third_party/openssl/openssl.gyp:openssl',
1210 'net_jni_headers', 1211 'net_jni_headers',
1211 ], 1212 ],
1212 'sources!': [ 1213 'sources!': [
1213 'base/cert_database_openssl.cc', 1214 'base/cert_database_openssl.cc',
1214 'base/openssl_memory_private_key_store.cc', 1215 'base/openssl_memory_private_key_store.cc',
1216 'base/test_root_certs_openssl.cc',
1215 ], 1217 ],
1216 }, { # else OS! = "android" 1218 }, { # else OS != "android"
1217 'defines': [ 1219 'defines': [
1218 # These are the features Android doesn't support. 1220 # These are the features Android doesn't support.
1219 'ENABLE_MEDIA_CODEC_THEORA', 1221 'ENABLE_MEDIA_CODEC_THEORA',
1220 ], 1222 ],
1221 }, 1223 },
1222 ], 1224 ],
1223 [ 'OS == "linux"', { 1225 [ 'OS == "linux"', {
1224 'dependencies': [ 1226 'dependencies': [
1225 '../build/linux/system.gyp:dbus', 1227 '../build/linux/system.gyp:dbus',
1226 '../dbus/dbus.gyp:dbus', 1228 '../dbus/dbus.gyp:dbus',
(...skipping 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after
2376 '--result', '<@(_outputs)', 2378 '--result', '<@(_outputs)',
2377 '--isolate', 'net_unittests.isolate', 2379 '--isolate', 'net_unittests.isolate',
2378 ], 2380 ],
2379 }, 2381 },
2380 ], 2382 ],
2381 }, 2383 },
2382 ], 2384 ],
2383 }], 2385 }],
2384 ], 2386 ],
2385 } 2387 }
OLDNEW
« no previous file with comments | « net/base/test_root_certs_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698