OLD | NEW |
---|---|
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 import("//build/buildflag_header.gni") | 5 import("//build/buildflag_header.gni") |
6 import("//build/config/android/config.gni") | 6 import("//build/config/android/config.gni") |
7 import("//build/config/android/rules.gni") | 7 import("//build/config/android/rules.gni") |
8 import("//build/util/version.gni") | 8 import("//build/util/version.gni") |
9 import("//chrome/version.gni") | 9 import("//chrome/version.gni") |
10 import("//testing/test.gni") | 10 import("//testing/test.gni") |
11 import("//third_party/protobuf/proto_library.gni") | |
11 import("//url/features.gni") | 12 import("//url/features.gni") |
12 | 13 |
13 assert(!is_component_build, "Cronet requires static library build.") | 14 assert(!is_component_build, "Cronet requires static library build.") |
14 | 15 |
15 declare_args() { | 16 declare_args() { |
16 cronet_enable_data_reduction_proxy_support = false | 17 cronet_enable_data_reduction_proxy_support = false |
17 } | 18 } |
18 | 19 |
19 generate_jni("cronet_jni_headers") { | 20 generate_jni("cronet_jni_headers") { |
20 sources = [ | 21 sources = [ |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
98 _cronet_version_header_include_dir = "$target_gen_dir/cronet_version_header" | 99 _cronet_version_header_include_dir = "$target_gen_dir/cronet_version_header" |
99 process_version("cronet_version_header") { | 100 process_version("cronet_version_header") { |
100 template_file = "//components/cronet/version.h.in" | 101 template_file = "//components/cronet/version.h.in" |
101 output = "$_cronet_version_header_include_dir/components/cronet/version.h" | 102 output = "$_cronet_version_header_include_dir/components/cronet/version.h" |
102 extra_args = [ | 103 extra_args = [ |
103 "-e", | 104 "-e", |
104 "VERSION_FULL=\"$chrome_version_full\"", | 105 "VERSION_FULL=\"$chrome_version_full\"", |
105 ] | 106 ] |
106 } | 107 } |
107 | 108 |
109 proto_library("cronet_cert_proto") { | |
110 sources = [ | |
111 "//components/cronet/cert/proto/cert_verification.proto", | |
112 ] | |
113 | |
114 extra_configs = [ "//build/config/compiler:wexit_time_destructors" ] | |
115 } | |
116 | |
108 # Variables: | 117 # Variables: |
109 # defines: Extra defines. | 118 # defines: Extra defines. |
110 # deps: Extra dependencies. | 119 # deps: Extra dependencies. |
111 template("cronet_static_tmpl") { | 120 template("cronet_static_tmpl") { |
112 source_set(target_name) { | 121 source_set(target_name) { |
113 defines = [] | 122 defines = [] |
114 | 123 |
115 deps = [ | 124 deps = [ |
116 ":chromium_url_request_java", | 125 ":chromium_url_request_java", |
126 ":cronet_cert_proto", | |
117 ":cronet_jni_headers", | 127 ":cronet_jni_headers", |
118 ":cronet_version_header", | 128 ":cronet_version_header", |
119 "//base", | 129 "//base", |
120 "//base:i18n", | 130 "//base:i18n", |
121 "//base/third_party/dynamic_annotations", | 131 "//base/third_party/dynamic_annotations", |
122 "//components/metrics", | 132 "//components/metrics", |
123 "//components/prefs", | 133 "//components/prefs", |
134 "//third_party/protobuf:protobuf_lite", | |
124 "//url:url_features", | 135 "//url:url_features", |
125 ] | 136 ] |
126 sources = [ | 137 sources = [ |
127 "//components/cronet/android/chromium_url_request.cc", | 138 "//components/cronet/android/chromium_url_request.cc", |
128 "//components/cronet/android/chromium_url_request.h", | 139 "//components/cronet/android/chromium_url_request.h", |
129 "//components/cronet/android/chromium_url_request_context.cc", | 140 "//components/cronet/android/chromium_url_request_context.cc", |
130 "//components/cronet/android/chromium_url_request_context.h", | 141 "//components/cronet/android/chromium_url_request_context.h", |
131 "//components/cronet/android/cronet_bidirectional_stream_adapter.cc", | 142 "//components/cronet/android/cronet_bidirectional_stream_adapter.cc", |
132 "//components/cronet/android/cronet_bidirectional_stream_adapter.h", | 143 "//components/cronet/android/cronet_bidirectional_stream_adapter.h", |
133 "//components/cronet/android/cronet_in_memory_pref_store.cc", | 144 "//components/cronet/android/cronet_in_memory_pref_store.cc", |
(...skipping 11 matching lines...) Expand all Loading... | |
145 "//components/cronet/android/io_buffer_with_byte_buffer.cc", | 156 "//components/cronet/android/io_buffer_with_byte_buffer.cc", |
146 "//components/cronet/android/io_buffer_with_byte_buffer.h", | 157 "//components/cronet/android/io_buffer_with_byte_buffer.h", |
147 "//components/cronet/android/url_request_adapter.cc", | 158 "//components/cronet/android/url_request_adapter.cc", |
148 "//components/cronet/android/url_request_adapter.h", | 159 "//components/cronet/android/url_request_adapter.h", |
149 "//components/cronet/android/url_request_context_adapter.cc", | 160 "//components/cronet/android/url_request_context_adapter.cc", |
150 "//components/cronet/android/url_request_context_adapter.h", | 161 "//components/cronet/android/url_request_context_adapter.h", |
151 "//components/cronet/android/url_request_error.cc", | 162 "//components/cronet/android/url_request_error.cc", |
152 "//components/cronet/android/url_request_error.h", | 163 "//components/cronet/android/url_request_error.h", |
153 "//components/cronet/android/wrapped_channel_upload_element_reader.cc", | 164 "//components/cronet/android/wrapped_channel_upload_element_reader.cc", |
154 "//components/cronet/android/wrapped_channel_upload_element_reader.h", | 165 "//components/cronet/android/wrapped_channel_upload_element_reader.h", |
166 "//components/cronet/cert/cert_verifier_cache_persister.cc", | |
167 "//components/cronet/cert/cert_verifier_cache_persister.h", | |
155 "//components/cronet/histogram_manager.cc", | 168 "//components/cronet/histogram_manager.cc", |
156 "//components/cronet/histogram_manager.h", | 169 "//components/cronet/histogram_manager.h", |
157 "//components/cronet/url_request_context_config.cc", | 170 "//components/cronet/url_request_context_config.cc", |
158 "//components/cronet/url_request_context_config.h", | 171 "//components/cronet/url_request_context_config.h", |
159 ] | 172 ] |
160 | 173 |
161 include_dirs = [ _cronet_version_header_include_dir ] | 174 include_dirs = [ _cronet_version_header_include_dir ] |
162 | 175 |
163 cflags = [ | 176 cflags = [ |
164 "-DLOGGING=1", | 177 "-DLOGGING=1", |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
418 "test/network_change_notifier_util.h", | 431 "test/network_change_notifier_util.h", |
419 "test/quic_test_server.cc", | 432 "test/quic_test_server.cc", |
420 "test/quic_test_server.h", | 433 "test/quic_test_server.h", |
421 "test/sdch_test_util.cc", | 434 "test/sdch_test_util.cc", |
422 "test/sdch_test_util.h", | 435 "test/sdch_test_util.h", |
423 "test/test_upload_data_stream_handler.cc", | 436 "test/test_upload_data_stream_handler.cc", |
424 "test/test_upload_data_stream_handler.h", | 437 "test/test_upload_data_stream_handler.h", |
425 ] | 438 ] |
426 | 439 |
427 deps = [ | 440 deps = [ |
441 ":cronet_cert_proto", | |
428 ":cronet_static", | 442 ":cronet_static", |
429 ":cronet_tests_jni_headers", | 443 ":cronet_tests_jni_headers", |
430 ":cronet_version_header", | 444 ":cronet_version_header", |
431 "//base", | 445 "//base", |
432 "//base:i18n", | 446 "//base:i18n", |
433 "//net", | 447 "//net", |
434 "//net:simple_quic_tools", | 448 "//net:simple_quic_tools", |
435 "//net:test_support", | 449 "//net:test_support", |
436 "//third_party/icu", | 450 "//third_party/icu", |
437 ] | 451 ] |
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
662 run_findbugs_override = true | 676 run_findbugs_override = true |
663 proguard_enabled = true | 677 proguard_enabled = true |
664 proguard_configs = [ | 678 proguard_configs = [ |
665 "proguard.cfg", | 679 "proguard.cfg", |
666 "test/javaperftests/proguard.cfg", | 680 "test/javaperftests/proguard.cfg", |
667 ] | 681 ] |
668 } | 682 } |
669 | 683 |
670 test("cronet_unittests") { | 684 test("cronet_unittests") { |
671 sources = [ | 685 sources = [ |
686 "//components/cronet/cert/cert_verifier_cache_persister_unittest.cc", | |
672 "//components/cronet/histogram_manager_unittest.cc", | 687 "//components/cronet/histogram_manager_unittest.cc", |
673 "//components/cronet/run_all_unittests.cc", | 688 "//components/cronet/run_all_unittests.cc", |
674 "//components/cronet/url_request_context_config_unittest.cc", | 689 "//components/cronet/url_request_context_config_unittest.cc", |
675 ] | 690 ] |
676 | 691 |
677 deps = [ | 692 deps = [ |
693 ":cronet_cert_proto", | |
678 ":cronet_static", | 694 ":cronet_static", |
679 "//base", | 695 "//base", |
680 "//base/test:test_support", | 696 "//base/test:test_support", |
681 "//components/metrics", | 697 "//components/metrics", |
682 "//net", | 698 "//net", |
699 "//net:test_support", | |
683 "//testing/gtest", | 700 "//testing/gtest", |
684 ] | 701 ] |
685 | 702 |
703 data = [ | |
704 "//net/data/ssl/certificates/ok_cert.pem", | |
705 "//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.
| |
706 ] | |
707 | |
686 if (is_android) { | 708 if (is_android) { |
687 shard_timeout = 180 | 709 shard_timeout = 180 |
688 } | 710 } |
689 } | 711 } |
690 | 712 |
691 _package_dir = "$root_out_dir/cronet" | 713 _package_dir = "$root_out_dir/cronet" |
692 _extract_cronet_jars_dir = "$target_gen_dir/cronet_jar_extract" | 714 _extract_cronet_jars_dir = "$target_gen_dir/cronet_jar_extract" |
693 | 715 |
694 action("extract_cronet_jars") { | 716 action("extract_cronet_jars") { |
695 # extract_from_jars.py deletes the target directory before extracting. | 717 # extract_from_jars.py deletes the target directory before extracting. |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
869 ":cronet_package_copy_native_lib", | 891 ":cronet_package_copy_native_lib", |
870 ":cronet_package_copy_native_lib_unstripped", | 892 ":cronet_package_copy_native_lib_unstripped", |
871 ":generate_javadoc", | 893 ":generate_javadoc", |
872 ":generate_licenses", | 894 ":generate_licenses", |
873 ":jar_cronet_api_source", | 895 ":jar_cronet_api_source", |
874 ":jar_cronet_other_source", | 896 ":jar_cronet_other_source", |
875 ":jar_cronet_sample_source", | 897 ":jar_cronet_sample_source", |
876 ":repackage_extracted_jars", | 898 ":repackage_extracted_jars", |
877 ] | 899 ] |
878 } | 900 } |
OLD | NEW |