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

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: 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
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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 'base/sys_addrinfo.h', 265 'base/sys_addrinfo.h',
266 'base/tcp_listen_socket.cc', 266 'base/tcp_listen_socket.cc',
267 'base/tcp_listen_socket.h', 267 'base/tcp_listen_socket.h',
268 'base/test_data_stream.cc', 268 'base/test_data_stream.cc',
269 'base/test_data_stream.h', 269 'base/test_data_stream.h',
270 'base/test_root_certs.cc', 270 'base/test_root_certs.cc',
271 'base/test_root_certs.h', 271 'base/test_root_certs.h',
272 'base/test_root_certs_mac.cc', 272 'base/test_root_certs_mac.cc',
273 'base/test_root_certs_nss.cc', 273 'base/test_root_certs_nss.cc',
274 'base/test_root_certs_openssl.cc', 274 'base/test_root_certs_openssl.cc',
275 'base/test_root_certs_android.cc',
digit1 2012/11/28 10:42:34 Adding this here is ok, but you also need a 'sourc
ppi 2012/11/28 13:37:31 As we have discussed, it should be ok without expl
275 'base/test_root_certs_win.cc', 276 'base/test_root_certs_win.cc',
276 'base/transport_security_state.cc', 277 'base/transport_security_state.cc',
277 'base/transport_security_state.h', 278 'base/transport_security_state.h',
278 'base/transport_security_state_static.h', 279 'base/transport_security_state_static.h',
279 'base/unix_domain_socket_posix.cc', 280 'base/unix_domain_socket_posix.cc',
280 'base/unix_domain_socket_posix.h', 281 'base/unix_domain_socket_posix.h',
281 'base/upload_bytes_element_reader.cc', 282 'base/upload_bytes_element_reader.cc',
282 'base/upload_bytes_element_reader.h', 283 'base/upload_bytes_element_reader.h',
283 'base/upload_data.cc', 284 'base/upload_data.cc',
284 'base/upload_data.h', 285 'base/upload_data.h',
(...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after
1185 'net_java', 1186 'net_java',
1186 ], 1187 ],
1187 }], 1188 }],
1188 [ 'OS == "android"', { 1189 [ 'OS == "android"', {
1189 'dependencies': [ 1190 'dependencies': [
1190 '../third_party/openssl/openssl.gyp:openssl', 1191 '../third_party/openssl/openssl.gyp:openssl',
1191 'net_jni_headers', 1192 'net_jni_headers',
1192 ], 1193 ],
1193 'sources!': [ 1194 'sources!': [
1194 'base/openssl_memory_private_key_store.cc', 1195 'base/openssl_memory_private_key_store.cc',
1196 'base/test_root_certs_openssl.cc',
1195 ], 1197 ],
1196 }, { # else OS! = "android" 1198 }, { # else OS != "android"
1197 'defines': [ 1199 'defines': [
1198 # These are the features Android doesn't support. 1200 # These are the features Android doesn't support.
1199 'ENABLE_MEDIA_CODEC_THEORA', 1201 'ENABLE_MEDIA_CODEC_THEORA',
1200 ], 1202 ],
1201 }, 1203 },
1202 ], 1204 ],
1203 [ 'OS == "linux"', { 1205 [ 'OS == "linux"', {
1204 'dependencies': [ 1206 'dependencies': [
1205 '../build/linux/system.gyp:dbus', 1207 '../build/linux/system.gyp:dbus',
1206 '../dbus/dbus.gyp:dbus', 1208 '../dbus/dbus.gyp:dbus',
(...skipping 1153 matching lines...) Expand 10 before | Expand all | Expand 10 after
2360 '--result', '<@(_outputs)', 2362 '--result', '<@(_outputs)',
2361 '--isolate', 'net_unittests.isolate', 2363 '--isolate', 'net_unittests.isolate',
2362 ], 2364 ],
2363 }, 2365 },
2364 ], 2366 ],
2365 }, 2367 },
2366 ], 2368 ],
2367 }], 2369 }],
2368 ], 2370 ],
2369 } 2371 }
OLDNEW
« net/base/test_root_certs_android.cc ('K') | « 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