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

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: 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
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',
59 'android/gurl_utils.cc', 61 'android/gurl_utils.cc',
60 'android/gurl_utils.h', 62 'android/gurl_utils.h',
61 'android/net_jni_registrar.cc', 63 'android/net_jni_registrar.cc',
62 'android/net_jni_registrar.h', 64 'android/net_jni_registrar.h',
63 'android/network_change_notifier_android.cc', 65 'android/network_change_notifier_android.cc',
64 'android/network_change_notifier_android.h', 66 'android/network_change_notifier_android.h',
65 'android/network_change_notifier_delegate_android.cc', 67 'android/network_change_notifier_delegate_android.cc',
66 'android/network_change_notifier_delegate_android.h', 68 'android/network_change_notifier_delegate_android.h',
67 'android/network_change_notifier_factory_android.cc', 69 'android/network_change_notifier_factory_android.cc',
68 'android/network_change_notifier_factory_android.h', 70 'android/network_change_notifier_factory_android.h',
(...skipping 2272 matching lines...) Expand 10 before | Expand all | Expand 10 after
2341 'target_name': 'net_java', 2343 'target_name': 'net_java',
2342 'type': 'none', 2344 'type': 'none',
2343 'variables': { 2345 'variables': {
2344 'package_name': 'net', 2346 'package_name': 'net',
2345 'java_in_dir': '../net/android/java', 2347 'java_in_dir': '../net/android/java',
2346 }, 2348 },
2347 'dependencies': [ 2349 'dependencies': [
2348 '../base/base.gyp:base', 2350 '../base/base.gyp:base',
2349 'net_errors_java', 2351 'net_errors_java',
2350 'certificate_mime_types_java', 2352 'certificate_mime_types_java',
2353 'cert_verify_result_android_java',
2351 ], 2354 ],
2352 'includes': [ '../build/java.gypi' ], 2355 'includes': [ '../build/java.gypi' ],
2353 }, 2356 },
2354 { 2357 {
2355 'target_name': 'net_java_test_support', 2358 'target_name': 'net_java_test_support',
2356 'type': 'none', 2359 'type': 'none',
2357 'variables': { 2360 'variables': {
2358 'package_name': 'net_java_test_support', 2361 'package_name': 'net_java_test_support',
2359 'java_in_dir': '../net/test/android/javatests', 2362 'java_in_dir': '../net/test/android/javatests',
2360 }, 2363 },
(...skipping 30 matching lines...) Expand all
2391 'type': 'none', 2394 'type': 'none',
2392 'sources': [ 2395 'sources': [
2393 'android/java/CertificateMimeType.template', 2396 'android/java/CertificateMimeType.template',
2394 ], 2397 ],
2395 'variables': { 2398 'variables': {
2396 'package_name': 'org.chromium.net', 2399 'package_name': 'org.chromium.net',
2397 'template_deps': ['base/mime_util_certificate_type_list.h'], 2400 'template_deps': ['base/mime_util_certificate_type_list.h'],
2398 }, 2401 },
2399 'includes': [ '../build/android/java_cpp_template.gypi' ], 2402 'includes': [ '../build/android/java_cpp_template.gypi' ],
2400 }, 2403 },
2404 {
2405 'target_name': 'cert_verify_result_android_java',
2406 'type': 'none',
2407 'sources': [
2408 'android/java/CertVerifyResultAndroid.template',
2409 ],
2410 'variables': {
2411 'package_name': 'org.chromium.net',
2412 'template_deps': ['android/cert_verify_result_android_list.h'],
2413 },
2414 'includes': [ '../build/android/java_cpp_template.gypi' ],
2415 },
2401 ], 2416 ],
2402 }], 2417 }],
2403 # Special target to wrap a gtest_target_type==shared_library 2418 # Special target to wrap a gtest_target_type==shared_library
2404 # net_unittests into an android apk for execution. 2419 # net_unittests into an android apk for execution.
2405 # See base.gyp for TODO(jrg)s about this strategy. 2420 # See base.gyp for TODO(jrg)s about this strategy.
2406 ['OS == "android" and gtest_target_type == "shared_library"', { 2421 ['OS == "android" and gtest_target_type == "shared_library"', {
2407 'targets': [ 2422 'targets': [
2408 { 2423 {
2409 'target_name': 'net_unittests_apk', 2424 'target_name': 'net_unittests_apk',
2410 'type': 'none', 2425 'type': 'none',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
2451 '--result', '<@(_outputs)', 2466 '--result', '<@(_outputs)',
2452 '--isolate', 'net_unittests.isolate', 2467 '--isolate', 'net_unittests.isolate',
2453 ], 2468 ],
2454 }, 2469 },
2455 ], 2470 ],
2456 }, 2471 },
2457 ], 2472 ],
2458 }], 2473 }],
2459 ], 2474 ],
2460 } 2475 }
OLDNEW
« net/android/java/src/org/chromium/net/X509Util.java ('K') | « 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