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

Side by Side Diff: components/cronet.gypi

Issue 586143002: Initial implementation of Cronet Async API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Helen's comments, add CronetUrlRequestContextTest. Created 6 years, 1 month 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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 'conditions': [ 6 'conditions': [
7 ['OS=="android" and use_icu_alternatives_on_android==1', { 7 ['OS=="android" and use_icu_alternatives_on_android==1', {
8 # TODO(mef): Figure out what needs to be done for gn script. 8 # TODO(mef): Figure out what needs to be done for gn script.
9 'targets': [ 9 'targets': [
10 { 10 {
11 'target_name': 'cronet_jni_headers', 11 'target_name': 'cronet_jni_headers',
12 'type': 'none', 12 'type': 'none',
13 'sources': [ 13 'sources': [
14 'cronet/android/java/src/org/chromium/net/CronetUrlRequest.java',
15 'cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.ja va',
14 'cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java', 16 'cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java',
15 'cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext. java', 17 'cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext. java',
16 ], 18 ],
17 'variables': { 19 'variables': {
18 'jni_gen_package': 'cronet', 20 'jni_gen_package': 'cronet',
19 }, 21 },
20 'includes': [ '../build/jni_generator.gypi' ], 22 'includes': [ '../build/jni_generator.gypi' ],
21 }, 23 },
22 { 24 {
25 'target_name': 'cronet_url_request_java_enum',
26 'type': 'none',
27 'variables': {
28 'source_file': 'cronet/android/cronet_url_request.h',
29 },
30 'includes': [ '../build/android/java_cpp_enum.gypi' ],
31 },
32 {
23 'target_name': 'cronet_url_request_error_list', 33 'target_name': 'cronet_url_request_error_list',
24 'type': 'none', 34 'type': 'none',
25 'sources': [ 35 'sources': [
26 'cronet/android/java/src/org/chromium/net/ChromiumUrlRequestError.te mplate', 36 'cronet/android/java/src/org/chromium/net/ChromiumUrlRequestError.te mplate',
27 ], 37 ],
28 'variables': { 38 'variables': {
29 'package_name': 'org/chromium/cronet', 39 'package_name': 'org/chromium/cronet',
30 'template_deps': ['cronet/android/chromium_url_request_error_list.h' ], 40 'template_deps': ['cronet/android/chromium_url_request_error_list.h' ],
31 }, 41 },
32 'includes': [ '../build/android/java_cpp_template.gypi' ], 42 'includes': [ '../build/android/java_cpp_template.gypi' ],
33 }, 43 },
34 { 44 {
35 'target_name': 'cronet_url_request_priority_list', 45 'target_name': 'cronet_url_request_priority_list',
36 'type': 'none', 46 'type': 'none',
37 'sources': [ 47 'sources': [
38 'cronet/android/java/src/org/chromium/net/ChromiumUrlRequestPriority .template', 48 'cronet/android/java/src/org/chromium/net/ChromiumUrlRequestPriority .template',
39 ], 49 ],
40 'variables': { 50 'variables': {
41 'package_name': 'org/chromium/cronet', 51 'package_name': 'org/chromium/cronet',
42 'template_deps': ['cronet/android/chromium_url_request_priority_list .h'], 52 'template_deps': ['cronet/android/chromium_url_request_priority_list .h'],
43 }, 53 },
44 'includes': [ '../build/android/java_cpp_template.gypi' ], 54 'includes': [ '../build/android/java_cpp_template.gypi' ],
45 }, 55 },
46 { 56 {
47 'target_name': 'cronet_url_request_context_config_list', 57 'target_name': 'cronet_url_request_context_config_list',
48 'type': 'none', 58 'type': 'none',
49 'sources': [ 59 'sources': [
50 'cronet/android/java/src/org/chromium/net/UrlRequestContextConfig.te mplate', 60 'cronet/android/java/src/org/chromium/net/UrlRequestContextConfigLis t.template',
51 ], 61 ],
52 'variables': { 62 'variables': {
53 'package_name': 'org/chromium/cronet', 63 'package_name': 'org/chromium/cronet',
54 'template_deps': ['cronet/url_request_context_config_list.h'], 64 'template_deps': ['cronet/url_request_context_config_list.h'],
55 }, 65 },
56 'includes': [ '../build/android/java_cpp_template.gypi' ], 66 'includes': [ '../build/android/java_cpp_template.gypi' ],
57 }, 67 },
58 { 68 {
59 'target_name': 'cronet_version', 69 'target_name': 'cronet_version',
60 'type': 'none', 70 'type': 'none',
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 { 114 {
105 'target_name': 'cronet_static', 115 'target_name': 'cronet_static',
106 'type': 'static_library', 116 'type': 'static_library',
107 'dependencies': [ 117 'dependencies': [
108 '../base/base.gyp:base', 118 '../base/base.gyp:base',
109 '../base/base.gyp:base_i18n', 119 '../base/base.gyp:base_i18n',
110 '../third_party/icu/icu.gyp:icui18n', 120 '../third_party/icu/icu.gyp:icui18n',
111 '../third_party/icu/icu.gyp:icuuc', 121 '../third_party/icu/icu.gyp:icuuc',
112 'cronet_jni_headers', 122 'cronet_jni_headers',
113 'cronet_url_request_context_config_list', 123 'cronet_url_request_context_config_list',
124 'cronet_url_request_java_enum',
114 'cronet_url_request_error_list', 125 'cronet_url_request_error_list',
115 'cronet_url_request_priority_list', 126 'cronet_url_request_priority_list',
116 'cronet_version', 127 'cronet_version',
117 '../net/net.gyp:net', 128 '../net/net.gyp:net',
118 ], 129 ],
119 'sources': [ 130 'sources': [
120 'cronet/url_request_context_config.cc', 131 'cronet/url_request_context_config.cc',
121 'cronet/url_request_context_config.h', 132 'cronet/url_request_context_config.h',
122 'cronet/url_request_context_config_list.h', 133 'cronet/url_request_context_config_list.h',
123 'cronet/android/chromium_url_request.cc', 134 'cronet/android/chromium_url_request.cc',
124 'cronet/android/chromium_url_request.h', 135 'cronet/android/chromium_url_request.h',
125 'cronet/android/chromium_url_request_error_list.h', 136 'cronet/android/chromium_url_request_error_list.h',
126 'cronet/android/chromium_url_request_priority_list.h', 137 'cronet/android/chromium_url_request_priority_list.h',
127 'cronet/android/chromium_url_request_context.cc', 138 'cronet/android/chromium_url_request_context.cc',
128 'cronet/android/chromium_url_request_context.h', 139 'cronet/android/chromium_url_request_context.h',
129 'cronet/android/cronet_loader.cc', 140 'cronet/android/cronet_loader.cc',
130 'cronet/android/cronet_loader.h', 141 'cronet/android/cronet_loader.h',
142 'cronet/android/cronet_url_request.cc',
143 'cronet/android/cronet_url_request.h',
144 'cronet/android/cronet_url_request_adapter.cc',
145 'cronet/android/cronet_url_request_adapter.h',
146 'cronet/android/cronet_url_request_context.cc',
147 'cronet/android/cronet_url_request_context.h',
148 'cronet/android/cronet_url_request_context_adapter.cc',
149 'cronet/android/cronet_url_request_context_adapter.h',
131 'cronet/android/url_request_adapter.cc', 150 'cronet/android/url_request_adapter.cc',
132 'cronet/android/url_request_adapter.h', 151 'cronet/android/url_request_adapter.h',
133 'cronet/android/url_request_context_adapter.cc', 152 'cronet/android/url_request_context_adapter.cc',
134 'cronet/android/url_request_context_adapter.h', 153 'cronet/android/url_request_context_adapter.h',
135 'cronet/android/wrapped_channel_upload_element_reader.cc', 154 'cronet/android/wrapped_channel_upload_element_reader.cc',
136 'cronet/android/wrapped_channel_upload_element_reader.h', 155 'cronet/android/wrapped_channel_upload_element_reader.h',
137 ], 156 ],
138 'cflags': [ 157 'cflags': [
139 '-DLOGGING=1', 158 '-DLOGGING=1',
140 '-fdata-sections', 159 '-fdata-sections',
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 # its implementation using HttpUrlConnection (not the Chromium stack). 198 # its implementation using HttpUrlConnection (not the Chromium stack).
180 'target_name': 'cronet_stub', 199 'target_name': 'cronet_stub',
181 'type': 'none', 200 'type': 'none',
182 'dependencies': [ 201 'dependencies': [
183 'cronet_url_request_context_config_list', 202 'cronet_url_request_context_config_list',
184 'cronet_version', 203 'cronet_version',
185 ], 204 ],
186 'variables': { 205 'variables': {
187 'java_in_dir': 'cronet/android/java', 206 'java_in_dir': 'cronet/android/java',
188 'javac_includes': [ 207 'javac_includes': [
189 '**/AsyncUrlRequest.java',
190 '**/AsyncUrlRequestException.java',
191 '**/AsyncUrlRequestFactory.java',
192 '**/AsyncUrlRequestListener.java',
193 '**/ResponseInfo.java',
194 '**/ChunkedWritableByteChannel.java', 208 '**/ChunkedWritableByteChannel.java',
209 '**/ExtendedResponseInfo.java',
195 '**/HttpUrlConnection*.java', 210 '**/HttpUrlConnection*.java',
196 '**/HttpUrlRequest*.java', 211 '**/HttpUrlRequest*.java',
212 '**/ResponseInfo.java',
197 '**/ResponseTooLargeException.java', 213 '**/ResponseTooLargeException.java',
214 '**/UrlRequest.java',
215 '**/UrlRequestContext.java',
216 '**/UrlRequestContextConfig.java',
217 '**/UrlRequestContextConfigList.java',
218 '**/UrlRequestException.java',
219 '**/UrlRequestListener.java',
198 '**/UserAgent.java', 220 '**/UserAgent.java',
199 # TODO(mef): Consider moving this into HttpUrlRequestConfig.
200 '**/UrlRequestContextConfig.java',
201 '**/Version.java', 221 '**/Version.java',
202 ], 222 ],
203 }, 223 },
204 'includes': [ '../build/java.gypi' ], 224 'includes': [ '../build/java.gypi' ],
205 }, 225 },
206 { # cronet.jar implements HttpUrlRequest interface using Chromium stack 226 { # cronet.jar implements HttpUrlRequest interface using Chromium stack
207 # in native libcronet.so library. 227 # in native libcronet.so library.
208 'target_name': 'cronet', 228 'target_name': 'cronet',
209 'type': 'none', 229 'type': 'none',
210 'dependencies': [ 230 'dependencies': [
211 '../base/base.gyp:base', 231 '../base/base.gyp:base',
212 'cronet_stub', 232 'cronet_stub',
213 'cronet_url_request_error_list', 233 'cronet_url_request_error_list',
234 'cronet_url_request_java_enum',
214 'cronet_url_request_priority_list', 235 'cronet_url_request_priority_list',
215 'libcronet', 236 'libcronet',
216 ], 237 ],
217 'variables': { 238 'variables': {
218 'java_in_dir': 'cronet/android/java', 239 'java_in_dir': 'cronet/android/java',
219 'javac_includes': [ 240 'javac_includes': [
220 '**/ChromiumAsyncUrlRequest.java', 241 '**/ChromiumAsyncUrlRequest.java',
221 '**/ChromiumUrlRequest.java', 242 '**/ChromiumUrlRequest.java',
222 '**/ChromiumUrlRequestContext.java', 243 '**/ChromiumUrlRequestContext.java',
223 '**/ChromiumUrlRequestError.java', 244 '**/ChromiumUrlRequestError.java',
224 '**/ChromiumUrlRequestFactory.java', 245 '**/ChromiumUrlRequestFactory.java',
225 '**/ChromiumUrlRequestPriority.java', 246 '**/ChromiumUrlRequestPriority.java',
226 '**/UsedByReflection.java', 247 '**/CronetResponseInfo.java',
248 '**/CronetUrlRequest.java',
249 '**/CronetUrlRequestContext.java',
250 '**/CronetUrlRequestFactory.java',
227 ], 251 ],
228 }, 252 },
229 'includes': [ '../build/java.gypi' ], 253 'includes': [ '../build/java.gypi' ],
230 }, 254 },
231 { 255 {
232 'target_name': 'cronet_package', 256 'target_name': 'cronet_package',
233 'type': 'none', 257 'type': 'none',
234 'dependencies': [ 258 'dependencies': [
235 'libcronet', 259 'libcronet',
236 'cronet', 260 'cronet',
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 'java_in_dir': 'cronet/android/test/javatests', 509 'java_in_dir': 'cronet/android/test/javatests',
486 'resource_dir': 'cronet/android/test/res', 510 'resource_dir': 'cronet/android/test/res',
487 'is_test_apk': 1, 511 'is_test_apk': 1,
488 }, 512 },
489 'includes': [ '../build/java_apk.gypi' ], 513 'includes': [ '../build/java_apk.gypi' ],
490 }, 514 },
491 ], 515 ],
492 }], # OS=="android" 516 }], # OS=="android"
493 ], 517 ],
494 } 518 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698