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

Side by Side Diff: net/net.gyp

Issue 12212135: Return specific cert verification errors on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 7 years, 10 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 | « net/base/cert_verify_proc_unittest.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 49 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
50 '../build/temp_gyp/googleurl.gyp:googleurl', 50 '../build/temp_gyp/googleurl.gyp:googleurl',
51 '../crypto/crypto.gyp:crypto', 51 '../crypto/crypto.gyp:crypto',
52 '../sdch/sdch.gyp:sdch', 52 '../sdch/sdch.gyp:sdch',
53 '../third_party/icu/icu.gyp:icui18n', 53 '../third_party/icu/icu.gyp:icui18n',
54 '../third_party/icu/icu.gyp:icuuc', 54 '../third_party/icu/icu.gyp:icuuc',
55 '../third_party/zlib/zlib.gyp:zlib', 55 '../third_party/zlib/zlib.gyp:zlib',
56 'net_resources', 56 'net_resources',
57 ], 57 ],
58 'sources': [ 58 'sources': [
59 'android/cert_verify_result_android.h',
60 'android/cert_verify_result_android_list.h',
61 'android/gurl_utils.cc',
62 'android/gurl_utils.h',
59 'android/keystore.cc', 63 'android/keystore.cc',
60 'android/keystore.h', 64 'android/keystore.h',
61 'android/keystore_openssl.cc', 65 'android/keystore_openssl.cc',
62 'android/keystore_openssl.h', 66 'android/keystore_openssl.h',
63 'android/gurl_utils.cc',
64 'android/gurl_utils.h',
65 'android/net_jni_registrar.cc', 67 'android/net_jni_registrar.cc',
66 'android/net_jni_registrar.h', 68 'android/net_jni_registrar.h',
67 'android/network_change_notifier_android.cc', 69 'android/network_change_notifier_android.cc',
68 'android/network_change_notifier_android.h', 70 'android/network_change_notifier_android.h',
69 'android/network_change_notifier_delegate_android.cc', 71 'android/network_change_notifier_delegate_android.cc',
70 'android/network_change_notifier_delegate_android.h', 72 'android/network_change_notifier_delegate_android.h',
71 'android/network_change_notifier_factory_android.cc', 73 'android/network_change_notifier_factory_android.cc',
72 'android/network_change_notifier_factory_android.h', 74 'android/network_change_notifier_factory_android.h',
73 'android/network_library.cc', 75 'android/network_library.cc',
74 'android/network_library.h', 76 'android/network_library.h',
(...skipping 2301 matching lines...) Expand 10 before | Expand all | Expand 10 after
2376 }, 2378 },
2377 { 2379 {
2378 'target_name': 'net_java', 2380 'target_name': 'net_java',
2379 'type': 'none', 2381 'type': 'none',
2380 'variables': { 2382 'variables': {
2381 'package_name': 'net', 2383 'package_name': 'net',
2382 'java_in_dir': '../net/android/java', 2384 'java_in_dir': '../net/android/java',
2383 }, 2385 },
2384 'dependencies': [ 2386 'dependencies': [
2385 '../base/base.gyp:base', 2387 '../base/base.gyp:base',
2388 'cert_verify_result_android_java',
2389 'certificate_mime_types_java',
2386 'net_errors_java', 2390 'net_errors_java',
2387 'certificate_mime_types_java',
2388 'private_key_types_java', 2391 'private_key_types_java',
2389 ], 2392 ],
2390 'includes': [ '../build/java.gypi' ], 2393 'includes': [ '../build/java.gypi' ],
2391 }, 2394 },
2392 { 2395 {
2393 'target_name': 'net_java_test_support', 2396 'target_name': 'net_java_test_support',
2394 'type': 'none', 2397 'type': 'none',
2395 'variables': { 2398 'variables': {
2396 'package_name': 'net_java_test_support', 2399 'package_name': 'net_java_test_support',
2397 'java_in_dir': '../net/test/android/javatests', 2400 'java_in_dir': '../net/test/android/javatests',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
2430 'sources': [ 2433 'sources': [
2431 'android/java/CertificateMimeType.template', 2434 'android/java/CertificateMimeType.template',
2432 ], 2435 ],
2433 'variables': { 2436 'variables': {
2434 'package_name': 'org.chromium.net', 2437 'package_name': 'org.chromium.net',
2435 'template_deps': ['base/mime_util_certificate_type_list.h'], 2438 'template_deps': ['base/mime_util_certificate_type_list.h'],
2436 }, 2439 },
2437 'includes': [ '../build/android/java_cpp_template.gypi' ], 2440 'includes': [ '../build/android/java_cpp_template.gypi' ],
2438 }, 2441 },
2439 { 2442 {
2443 'target_name': 'cert_verify_result_android_java',
2444 'type': 'none',
2445 'sources': [
2446 'android/java/CertVerifyResultAndroid.template',
2447 ],
2448 'variables': {
2449 'package_name': 'org.chromium.net',
2450 'template_deps': ['android/cert_verify_result_android_list.h'],
2451 },
2452 'includes': [ '../build/android/java_cpp_template.gypi' ],
2453 },
2454 {
2440 'target_name': 'private_key_types_java', 2455 'target_name': 'private_key_types_java',
2441 'type': 'none', 2456 'type': 'none',
2442 'sources': [ 2457 'sources': [
2443 'android/java/PrivateKeyType.template', 2458 'android/java/PrivateKeyType.template',
2444 ], 2459 ],
2445 'variables': { 2460 'variables': {
2446 'package_name': 'org.chromium.net', 2461 'package_name': 'org.chromium.net',
2447 'template_deps': ['android/private_key_type_list.h'], 2462 'template_deps': ['android/private_key_type_list.h'],
2448 }, 2463 },
2449 'includes': [ '../build/android/java_cpp_template.gypi' ], 2464 'includes': [ '../build/android/java_cpp_template.gypi' ],
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
2502 '--result', '<@(_outputs)', 2517 '--result', '<@(_outputs)',
2503 '--isolate', 'net_unittests.isolate', 2518 '--isolate', 'net_unittests.isolate',
2504 ], 2519 ],
2505 }, 2520 },
2506 ], 2521 ],
2507 }, 2522 },
2508 ], 2523 ],
2509 }], 2524 }],
2510 ], 2525 ],
2511 } 2526 }
OLDNEW
« no previous file with comments | « net/base/cert_verify_proc_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698