Chromium Code Reviews| Index: components/cronet/android/BUILD.gn |
| diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn |
| index 48b91046012f32cc836c44a5f4da01d75150ab00..f9f0149cb04613ece15e7bd1789ebf5bae20d19e 100644 |
| --- a/components/cronet/android/BUILD.gn |
| +++ b/components/cronet/android/BUILD.gn |
| @@ -8,6 +8,7 @@ import("//build/config/android/rules.gni") |
| import("//build/util/version.gni") |
| import("//chrome/version.gni") |
| import("//testing/test.gni") |
| +import("//third_party/protobuf/proto_library.gni") |
| import("//url/features.gni") |
| assert(!is_component_build, "Cronet requires static library build.") |
| @@ -105,6 +106,14 @@ process_version("cronet_version_header") { |
| ] |
| } |
| +proto_library("cronet_cert_proto") { |
| + sources = [ |
| + "//components/cronet/cert/proto/cert_verification.proto", |
| + ] |
| + |
| + extra_configs = [ "//build/config/compiler:wexit_time_destructors" ] |
| +} |
| + |
| # Variables: |
| # defines: Extra defines. |
| # deps: Extra dependencies. |
| @@ -114,6 +123,7 @@ template("cronet_static_tmpl") { |
| deps = [ |
| ":chromium_url_request_java", |
| + ":cronet_cert_proto", |
| ":cronet_jni_headers", |
| ":cronet_version_header", |
| "//base", |
| @@ -121,6 +131,7 @@ template("cronet_static_tmpl") { |
| "//base/third_party/dynamic_annotations", |
| "//components/metrics", |
| "//components/prefs", |
| + "//third_party/protobuf:protobuf_lite", |
| "//url:url_features", |
| ] |
| sources = [ |
| @@ -152,6 +163,8 @@ template("cronet_static_tmpl") { |
| "//components/cronet/android/url_request_error.h", |
| "//components/cronet/android/wrapped_channel_upload_element_reader.cc", |
| "//components/cronet/android/wrapped_channel_upload_element_reader.h", |
| + "//components/cronet/cert/cert_verifier_cache_persister.cc", |
| + "//components/cronet/cert/cert_verifier_cache_persister.h", |
| "//components/cronet/histogram_manager.cc", |
| "//components/cronet/histogram_manager.h", |
| "//components/cronet/url_request_context_config.cc", |
| @@ -425,6 +438,7 @@ shared_library("cronet_tests") { |
| ] |
| deps = [ |
| + ":cronet_cert_proto", |
| ":cronet_static", |
| ":cronet_tests_jni_headers", |
| ":cronet_version_header", |
| @@ -669,20 +683,28 @@ android_apk("cronet_perf_test_apk") { |
| test("cronet_unittests") { |
| sources = [ |
| + "//components/cronet/cert/cert_verifier_cache_persister_unittest.cc", |
| "//components/cronet/histogram_manager_unittest.cc", |
| "//components/cronet/run_all_unittests.cc", |
| "//components/cronet/url_request_context_config_unittest.cc", |
| ] |
| deps = [ |
| + ":cronet_cert_proto", |
| ":cronet_static", |
| "//base", |
| "//base/test:test_support", |
| "//components/metrics", |
| "//net", |
| + "//net:test_support", |
| "//testing/gtest", |
| ] |
| + data = [ |
| + "//net/data/ssl/certificates/ok_cert.pem", |
| + "//net/data/ssl/certificates/root_ca_cert.pem", |
|
Ryan Sleevi
2016/06/14 21:52:32
I want to reiterate: This should NOT be done.
If
ramant (doing other things)
2016/06/14 22:38:19
jbudorick@ is working on a fix for this. Will fix
jbudorick
2016/06/15 13:53:19
Depending on //net:test_support was not sufficient
ramant (doing other things)
2016/06/15 21:31:48
Done.
|
| + ] |
| + |
| if (is_android) { |
| shard_timeout = 180 |
| } |