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

Side by Side Diff: components/cronet/android/BUILD.gn

Issue 1393713005: [Cronet] Add error code and immediatelyRetryable() to UrlRequestException (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix missing test annotation Created 4 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 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")
(...skipping 11 matching lines...) Expand all
22 "java/src/org/chromium/net/ChromiumUrlRequestContext.java", 22 "java/src/org/chromium/net/ChromiumUrlRequestContext.java",
23 "java/src/org/chromium/net/CronetBidirectionalStream.java", 23 "java/src/org/chromium/net/CronetBidirectionalStream.java",
24 "java/src/org/chromium/net/CronetLibraryLoader.java", 24 "java/src/org/chromium/net/CronetLibraryLoader.java",
25 "java/src/org/chromium/net/CronetUploadDataStream.java", 25 "java/src/org/chromium/net/CronetUploadDataStream.java",
26 "java/src/org/chromium/net/CronetUrlRequest.java", 26 "java/src/org/chromium/net/CronetUrlRequest.java",
27 "java/src/org/chromium/net/CronetUrlRequestContext.java", 27 "java/src/org/chromium/net/CronetUrlRequestContext.java",
28 ] 28 ]
29 jni_package = "cronet" 29 jni_package = "cronet"
30 } 30 }
31 31
32 java_cpp_enum("cronet_url_request_java") { 32 java_cpp_enum("chromium_url_request_java") {
33 sources = [ 33 sources = [
34 "chromium_url_request.h", 34 "chromium_url_request.h",
35 ] 35 ]
36 } 36 }
37 37
38 java_cpp_enum("net_request_priority_java") { 38 java_cpp_enum("net_request_priority_java") {
39 sources = [ 39 sources = [
40 "//net/base/request_priority.h", 40 "//net/base/request_priority.h",
41 ] 41 ]
42 } 42 }
43 43
44 java_cpp_enum("network_quality_observations_java") { 44 java_cpp_enum("network_quality_observations_java") {
45 sources = [ 45 sources = [
46 "//net/base/network_quality_estimator.h", 46 "//net/base/network_quality_estimator.h",
47 ] 47 ]
48 } 48 }
49 49
50 java_cpp_enum("url_request_error_java") {
51 sources = [
52 "url_request_error.h",
53 ]
54 }
55
56 # This target is a jar file containing classes that Cronet's javadocs
57 # may reference but are not included in the javadocs themselves.
58 android_library("cronet_javadoc_classpath") {
59 srcjar_deps = [ ":url_request_error_java" ]
60 }
61
50 java_cpp_enum("http_cache_type_java") { 62 java_cpp_enum("http_cache_type_java") {
51 sources = [ 63 sources = [
52 "//components/cronet/url_request_context_config.h", 64 "//components/cronet/url_request_context_config.h",
53 ] 65 ]
54 } 66 }
55 67
56 java_cpp_template("load_states_list") { 68 java_cpp_template("load_states_list") {
57 sources = [ 69 sources = [
58 "java/src/org/chromium/net/LoadState.template", 70 "java/src/org/chromium/net/LoadState.template",
59 ] 71 ]
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 } 106 }
95 107
96 # Variables: 108 # Variables:
97 # defines: Extra defines. 109 # defines: Extra defines.
98 # deps: Extra dependencies. 110 # deps: Extra dependencies.
99 template("cronet_static_tmpl") { 111 template("cronet_static_tmpl") {
100 source_set(target_name) { 112 source_set(target_name) {
101 defines = [] 113 defines = []
102 114
103 deps = [ 115 deps = [
116 ":chromium_url_request_java",
104 ":cronet_jni_headers", 117 ":cronet_jni_headers",
105 ":cronet_url_request_java",
106 ":cronet_version_header", 118 ":cronet_version_header",
107 ":features", 119 ":features",
108 "//base", 120 "//base",
109 "//base:i18n", 121 "//base:i18n",
110 "//base/third_party/dynamic_annotations", 122 "//base/third_party/dynamic_annotations",
111 "//components/metrics", 123 "//components/metrics",
112 "//components/prefs", 124 "//components/prefs",
113 ] 125 ]
114 sources = [ 126 sources = [
115 "//components/cronet/android/chromium_url_request.cc", 127 "//components/cronet/android/chromium_url_request.cc",
116 "//components/cronet/android/chromium_url_request.h", 128 "//components/cronet/android/chromium_url_request.h",
117 "//components/cronet/android/chromium_url_request_context.cc", 129 "//components/cronet/android/chromium_url_request_context.cc",
118 "//components/cronet/android/chromium_url_request_context.h", 130 "//components/cronet/android/chromium_url_request_context.h",
119 "//components/cronet/android/cronet_in_memory_pref_store.cc", 131 "//components/cronet/android/cronet_in_memory_pref_store.cc",
120 "//components/cronet/android/cronet_in_memory_pref_store.h", 132 "//components/cronet/android/cronet_in_memory_pref_store.h",
121 "//components/cronet/android/cronet_library_loader.cc", 133 "//components/cronet/android/cronet_library_loader.cc",
122 "//components/cronet/android/cronet_library_loader.h", 134 "//components/cronet/android/cronet_library_loader.h",
123 "//components/cronet/android/cronet_upload_data_stream.cc", 135 "//components/cronet/android/cronet_upload_data_stream.cc",
124 "//components/cronet/android/cronet_upload_data_stream.h", 136 "//components/cronet/android/cronet_upload_data_stream.h",
125 "//components/cronet/android/cronet_upload_data_stream_adapter.cc", 137 "//components/cronet/android/cronet_upload_data_stream_adapter.cc",
126 "//components/cronet/android/cronet_upload_data_stream_adapter.h", 138 "//components/cronet/android/cronet_upload_data_stream_adapter.h",
127 "//components/cronet/android/cronet_url_request_adapter.cc", 139 "//components/cronet/android/cronet_url_request_adapter.cc",
128 "//components/cronet/android/cronet_url_request_adapter.h", 140 "//components/cronet/android/cronet_url_request_adapter.h",
129 "//components/cronet/android/cronet_url_request_context_adapter.cc", 141 "//components/cronet/android/cronet_url_request_context_adapter.cc",
130 "//components/cronet/android/cronet_url_request_context_adapter.h", 142 "//components/cronet/android/cronet_url_request_context_adapter.h",
131 "//components/cronet/android/url_request_adapter.cc", 143 "//components/cronet/android/url_request_adapter.cc",
132 "//components/cronet/android/url_request_adapter.h", 144 "//components/cronet/android/url_request_adapter.h",
133 "//components/cronet/android/url_request_context_adapter.cc", 145 "//components/cronet/android/url_request_context_adapter.cc",
134 "//components/cronet/android/url_request_context_adapter.h", 146 "//components/cronet/android/url_request_context_adapter.h",
147 "//components/cronet/android/url_request_error.cc",
148 "//components/cronet/android/url_request_error.h",
135 "//components/cronet/android/wrapped_channel_upload_element_reader.cc", 149 "//components/cronet/android/wrapped_channel_upload_element_reader.cc",
136 "//components/cronet/android/wrapped_channel_upload_element_reader.h", 150 "//components/cronet/android/wrapped_channel_upload_element_reader.h",
137 "//components/cronet/histogram_manager.cc", 151 "//components/cronet/histogram_manager.cc",
138 "//components/cronet/histogram_manager.h", 152 "//components/cronet/histogram_manager.h",
139 "//components/cronet/url_request_context_config.cc", 153 "//components/cronet/url_request_context_config.cc",
140 "//components/cronet/url_request_context_config.h", 154 "//components/cronet/url_request_context_config.h",
141 ] 155 ]
142 156
143 include_dirs = [ _cronet_version_header_include_dir ] 157 include_dirs = [ _cronet_version_header_include_dir ]
144 158
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 android_library("cronet_api") { 245 android_library("cronet_api") {
232 DEPRECATED_java_in_dir = "api/src" 246 DEPRECATED_java_in_dir = "api/src"
233 247
234 deps = [ 248 deps = [
235 "//third_party/android_tools:android_support_annotations_javalib", 249 "//third_party/android_tools:android_support_annotations_javalib",
236 ] 250 ]
237 251
238 srcjar_deps = [ 252 srcjar_deps = [
239 ":cronet_version_srcjar", 253 ":cronet_version_srcjar",
240 ":http_cache_type_java", 254 ":http_cache_type_java",
255 ":url_request_error_java",
241 ":load_states_list", 256 ":load_states_list",
242 ":network_quality_observations_java", 257 ":network_quality_observations_java",
243 ] 258 ]
244 259
245 run_findbugs = true 260 run_findbugs = true
246 } 261 }
247 262
248 android_library("cronet_java") { 263 android_library("cronet_java") {
249 java_files = [ 264 java_files = [
250 "java/src/org/chromium/net/ChromiumUrlRequest.java", 265 "java/src/org/chromium/net/ChromiumUrlRequest.java",
(...skipping 17 matching lines...) Expand all
268 283
269 deps = [ 284 deps = [
270 ":cronet_api", 285 ":cronet_api",
271 "//base:base_java", 286 "//base:base_java",
272 "//net/android:net_java", 287 "//net/android:net_java",
273 "//third_party/android_tools:android_support_annotations_javalib", 288 "//third_party/android_tools:android_support_annotations_javalib",
274 "//third_party/jsr-305:jsr_305_javalib", 289 "//third_party/jsr-305:jsr_305_javalib",
275 ] 290 ]
276 291
277 srcjar_deps = [ 292 srcjar_deps = [
278 ":cronet_url_request_java", 293 ":chromium_url_request_java",
279 ":net_request_priority_java", 294 ":net_request_priority_java",
280 ] 295 ]
281 296
282 run_findbugs = true 297 run_findbugs = true
283 } 298 }
284 299
285 android_resources("cronet_sample_apk_resources") { 300 android_resources("cronet_sample_apk_resources") {
286 resource_dirs = [ "sample/res" ] 301 resource_dirs = [ "sample/res" ]
287 android_manifest = "sample/AndroidManifest.xml" 302 android_manifest = "sample/AndroidManifest.xml"
288 } 303 }
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 rebase_path(_license_path, root_build_dir), 758 rebase_path(_license_path, root_build_dir),
744 ] 759 ]
745 } 760 }
746 761
747 action("generate_javadoc") { 762 action("generate_javadoc") {
748 script = "//components/cronet/tools/generate_javadoc.py" 763 script = "//components/cronet/tools/generate_javadoc.py"
749 depfile = "$target_gen_dir/$target_name.d" 764 depfile = "$target_gen_dir/$target_name.d"
750 outputs = [ 765 outputs = [
751 depfile, 766 depfile,
752 ] 767 ]
753
754 args = [ 768 args = [
755 "--output-dir", 769 "--output-dir",
756 rebase_path(_package_dir, root_build_dir), 770 rebase_path(_package_dir, root_build_dir),
757 "--input-dir", 771 "--input-dir",
758 rebase_path("//components/cronet", root_build_dir), 772 rebase_path("//components/cronet", root_build_dir),
759 "--overview-file", 773 "--overview-file",
760 rebase_path("$_package_dir/README.md.html", root_build_dir), 774 rebase_path("$_package_dir/README.md.html", root_build_dir),
761 "--readme-file", 775 "--readme-file",
762 rebase_path("//components/cronet/README.md", root_build_dir), 776 rebase_path("//components/cronet/README.md", root_build_dir),
763 "--depfile", 777 "--depfile",
764 rebase_path(depfile, root_build_dir), 778 rebase_path(depfile, root_build_dir),
779 "--lib-java-dir",
780 rebase_path("$root_build_dir/lib.java/components/cronet/android",
781 root_build_dir),
782 ]
783 deps = [
784 ":cronet_javadoc_classpath",
765 ] 785 ]
766 } 786 }
767 787
768 copy("cronet_package_copy") { 788 copy("cronet_package_copy") {
769 sources = [ 789 sources = [
770 "$root_out_dir/lib.java/components/cronet/android/cronet_api.jar", 790 "$root_out_dir/lib.java/components/cronet/android/cronet_api.jar",
771 "//AUTHORS", 791 "//AUTHORS",
772 "//chrome/VERSION", 792 "//chrome/VERSION",
773 "//components/cronet/android/proguard.cfg", 793 "//components/cronet/android/proguard.cfg",
774 ] 794 ]
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 ":jar_cronet_sample_source", 837 ":jar_cronet_sample_source",
818 ":repackage_extracted_jars", 838 ":repackage_extracted_jars",
819 ] 839 ]
820 } 840 }
821 841
822 buildflag_header("features") { 842 buildflag_header("features") {
823 header = "../cronet_features.h" 843 header = "../cronet_features.h"
824 844
825 flags = [ "ENABLE_BIDIRECTIONAL_STREAM=$cronet_enable_bidirectional_stream" ] 845 flags = [ "ENABLE_BIDIRECTIONAL_STREAM=$cronet_enable_bidirectional_stream" ]
826 } 846 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698