| Index: net/net.gyp
|
| diff --git a/net/net.gyp b/net/net.gyp
|
| index 9fad87ba48b00b1104c61db861bf2089db1face2..6e152159bd41c3c4ab809002b0e4bc561db7da9d 100644
|
| --- a/net/net.gyp
|
| +++ b/net/net.gyp
|
| @@ -56,12 +56,14 @@
|
| 'net_resources',
|
| ],
|
| 'sources': [
|
| + 'android/cert_verify_result_android.h',
|
| + 'android/cert_verify_result_android_list.h',
|
| + 'android/gurl_utils.cc',
|
| + 'android/gurl_utils.h',
|
| 'android/keystore.cc',
|
| 'android/keystore.h',
|
| 'android/keystore_openssl.cc',
|
| 'android/keystore_openssl.h',
|
| - 'android/gurl_utils.cc',
|
| - 'android/gurl_utils.h',
|
| 'android/net_jni_registrar.cc',
|
| 'android/net_jni_registrar.h',
|
| 'android/network_change_notifier_android.cc',
|
| @@ -2383,8 +2385,9 @@
|
| },
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| - 'net_errors_java',
|
| + 'cert_verify_result_android_java',
|
| 'certificate_mime_types_java',
|
| + 'net_errors_java',
|
| 'private_key_types_java',
|
| ],
|
| 'includes': [ '../build/java.gypi' ],
|
| @@ -2437,6 +2440,18 @@
|
| 'includes': [ '../build/android/java_cpp_template.gypi' ],
|
| },
|
| {
|
| + 'target_name': 'cert_verify_result_android_java',
|
| + 'type': 'none',
|
| + 'sources': [
|
| + 'android/java/CertVerifyResultAndroid.template',
|
| + ],
|
| + 'variables': {
|
| + 'package_name': 'org.chromium.net',
|
| + 'template_deps': ['android/cert_verify_result_android_list.h'],
|
| + },
|
| + 'includes': [ '../build/android/java_cpp_template.gypi' ],
|
| + },
|
| + {
|
| 'target_name': 'private_key_types_java',
|
| 'type': 'none',
|
| 'sources': [
|
|
|