Chromium Code Reviews| OLD | NEW | 
|---|---|
| 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"', { | 7 ['OS=="android"', { | 
| 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/ChromiumUrlRequest.java', | |
| 15 'cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext. java', | |
| 16 'cronet/android/java/src/org/chromium/net/CronetUploadDataStream.jav a', | |
| 14 'cronet/android/java/src/org/chromium/net/CronetUrlRequest.java', | 17 'cronet/android/java/src/org/chromium/net/CronetUrlRequest.java', | 
| 15 'cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.ja va', | 18 'cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.ja va', | 
| 16 'cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java', | |
| 17 'cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext. java', | |
| 18 'cronet/android/java/src/org/chromium/net/HistogramManager.java', | 19 'cronet/android/java/src/org/chromium/net/HistogramManager.java', | 
| 19 ], | 20 ], | 
| 20 'variables': { | 21 'variables': { | 
| 21 'jni_gen_package': 'cronet', | 22 'jni_gen_package': 'cronet', | 
| 22 }, | 23 }, | 
| 23 'includes': [ '../build/jni_generator.gypi' ], | 24 'includes': [ '../build/jni_generator.gypi' ], | 
| 24 }, | 25 }, | 
| 25 { | 26 { | 
| 26 'target_name': 'cronet_url_request_java', | 27 'target_name': 'cronet_url_request_java', | 
| 27 'type': 'none', | 28 'type': 'none', | 
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 115 'sources': [ | 116 'sources': [ | 
| 116 'cronet/url_request_context_config.cc', | 117 'cronet/url_request_context_config.cc', | 
| 117 'cronet/url_request_context_config.h', | 118 'cronet/url_request_context_config.h', | 
| 118 'cronet/url_request_context_config_list.h', | 119 'cronet/url_request_context_config_list.h', | 
| 119 'cronet/android/chromium_url_request.cc', | 120 'cronet/android/chromium_url_request.cc', | 
| 120 'cronet/android/chromium_url_request.h', | 121 'cronet/android/chromium_url_request.h', | 
| 121 'cronet/android/chromium_url_request_error_list.h', | 122 'cronet/android/chromium_url_request_error_list.h', | 
| 122 'cronet/android/chromium_url_request_priority_list.h', | 123 'cronet/android/chromium_url_request_priority_list.h', | 
| 123 'cronet/android/chromium_url_request_context.cc', | 124 'cronet/android/chromium_url_request_context.cc', | 
| 124 'cronet/android/chromium_url_request_context.h', | 125 'cronet/android/chromium_url_request_context.h', | 
| 126 'cronet/android/cronet_upload_data_stream_adapter.cc', | |
| 
 
mef
2015/02/03 22:08:23
nit: these should go below cronet_loader.
 
xunjieli
2015/02/03 22:18:51
Done.
 
 | |
| 127 'cronet/android/cronet_upload_data_stream_adapter.h', | |
| 128 'cronet/android/cronet_upload_data_stream.cc', | |
| 129 'cronet/android/cronet_upload_data_stream.h', | |
| 125 'cronet/android/cronet_loader.cc', | 130 'cronet/android/cronet_loader.cc', | 
| 126 'cronet/android/cronet_loader.h', | 131 'cronet/android/cronet_loader.h', | 
| 127 'cronet/android/cronet_url_request.cc', | 132 'cronet/android/cronet_url_request.cc', | 
| 128 'cronet/android/cronet_url_request.h', | 133 'cronet/android/cronet_url_request.h', | 
| 129 'cronet/android/cronet_url_request_adapter.cc', | 134 'cronet/android/cronet_url_request_adapter.cc', | 
| 130 'cronet/android/cronet_url_request_adapter.h', | 135 'cronet/android/cronet_url_request_adapter.h', | 
| 131 'cronet/android/cronet_url_request_context.cc', | 136 'cronet/android/cronet_url_request_context.cc', | 
| 132 'cronet/android/cronet_url_request_context.h', | 137 'cronet/android/cronet_url_request_context.h', | 
| 133 'cronet/android/cronet_url_request_context_adapter.cc', | 138 'cronet/android/cronet_url_request_context_adapter.cc', | 
| 134 'cronet/android/cronet_url_request_context_adapter.h', | 139 'cronet/android/cronet_url_request_context_adapter.h', | 
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 191 ], | 196 ], | 
| 192 'variables': { | 197 'variables': { | 
| 193 'java_in_dir': 'cronet/android/java', | 198 'java_in_dir': 'cronet/android/java', | 
| 194 'javac_includes': [ | 199 'javac_includes': [ | 
| 195 '**/ChunkedWritableByteChannel.java', | 200 '**/ChunkedWritableByteChannel.java', | 
| 196 '**/ExtendedResponseInfo.java', | 201 '**/ExtendedResponseInfo.java', | 
| 197 '**/HttpUrlConnection*.java', | 202 '**/HttpUrlConnection*.java', | 
| 198 '**/HttpUrlRequest*.java', | 203 '**/HttpUrlRequest*.java', | 
| 199 '**/ResponseInfo.java', | 204 '**/ResponseInfo.java', | 
| 200 '**/ResponseTooLargeException.java', | 205 '**/ResponseTooLargeException.java', | 
| 206 '**/UploadDataProvider.java', | |
| 207 '**/UploadDataSink.java', | |
| 201 '**/UrlRequest.java', | 208 '**/UrlRequest.java', | 
| 202 '**/UrlRequestContext.java', | 209 '**/UrlRequestContext.java', | 
| 203 '**/UrlRequestContextConfig.java', | 210 '**/UrlRequestContextConfig.java', | 
| 204 '**/UrlRequestContextConfigList.java', | 211 '**/UrlRequestContextConfigList.java', | 
| 205 '**/UrlRequestException.java', | 212 '**/UrlRequestException.java', | 
| 206 '**/UrlRequestListener.java', | 213 '**/UrlRequestListener.java', | 
| 207 '**/UserAgent.java', | 214 '**/UserAgent.java', | 
| 208 '**/Version.java', | 215 '**/Version.java', | 
| 209 ], | 216 ], | 
| 210 }, | 217 }, | 
| (...skipping 13 matching lines...) Expand all Loading... | |
| 224 'variables': { | 231 'variables': { | 
| 225 'java_in_dir': 'cronet/android/java', | 232 'java_in_dir': 'cronet/android/java', | 
| 226 'javac_includes': [ | 233 'javac_includes': [ | 
| 227 '**/ChromiumAsyncUrlRequest.java', | 234 '**/ChromiumAsyncUrlRequest.java', | 
| 228 '**/ChromiumUrlRequest.java', | 235 '**/ChromiumUrlRequest.java', | 
| 229 '**/ChromiumUrlRequestContext.java', | 236 '**/ChromiumUrlRequestContext.java', | 
| 230 '**/ChromiumUrlRequestError.java', | 237 '**/ChromiumUrlRequestError.java', | 
| 231 '**/ChromiumUrlRequestFactory.java', | 238 '**/ChromiumUrlRequestFactory.java', | 
| 232 '**/ChromiumUrlRequestPriority.java', | 239 '**/ChromiumUrlRequestPriority.java', | 
| 233 '**/CronetResponseInfo.java', | 240 '**/CronetResponseInfo.java', | 
| 241 '**/CronetUploadDataStream.java', | |
| 234 '**/CronetUrlRequest.java', | 242 '**/CronetUrlRequest.java', | 
| 235 '**/CronetUrlRequestContext.java', | 243 '**/CronetUrlRequestContext.java', | 
| 236 '**/CronetUrlRequestFactory.java', | 244 '**/CronetUrlRequestFactory.java', | 
| 237 '**/HistogramManager.java', | 245 '**/HistogramManager.java', | 
| 238 '**/RequestPriority.java', | 246 '**/RequestPriority.java', | 
| 239 '**/urlconnection/CronetInputStream.java', | 247 '**/urlconnection/CronetInputStream.java', | 
| 240 '**/urlconnection/CronetHttpURLConnection.java', | 248 '**/urlconnection/CronetHttpURLConnection.java', | 
| 241 '**/urlconnection/CronetHttpURLStreamHandler.java', | 249 '**/urlconnection/CronetHttpURLStreamHandler.java', | 
| 242 '**/urlconnection/CronetURLStreamHandlerFactory.java', | 250 '**/urlconnection/CronetURLStreamHandlerFactory.java', | 
| 243 '**/urlconnection/MessageLoop.java', | 251 '**/urlconnection/MessageLoop.java', | 
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 295 }, | 303 }, | 
| 296 'includes': [ '../build/java_apk.gypi' ], | 304 'includes': [ '../build/java_apk.gypi' ], | 
| 297 }, | 305 }, | 
| 298 { | 306 { | 
| 299 'target_name': 'cronet_tests_jni_headers', | 307 'target_name': 'cronet_tests_jni_headers', | 
| 300 'type': 'none', | 308 'type': 'none', | 
| 301 'sources': [ | 309 'sources': [ | 
| 302 'cronet/android/test/src/org/chromium/cronet_test_apk/CronetTestUtil .java', | 310 'cronet/android/test/src/org/chromium/cronet_test_apk/CronetTestUtil .java', | 
| 303 'cronet/android/test/src/org/chromium/cronet_test_apk/MockUrlRequest JobFactory.java', | 311 'cronet/android/test/src/org/chromium/cronet_test_apk/MockUrlRequest JobFactory.java', | 
| 304 'cronet/android/test/src/org/chromium/cronet_test_apk/NativeTestServ er.java', | 312 'cronet/android/test/src/org/chromium/cronet_test_apk/NativeTestServ er.java', | 
| 313 'cronet/android/test/src/org/chromium/cronet_test_apk/UploadDataStre amHandler.java', | |
| 305 'cronet/android/test/src/org/chromium/cronet_test_apk/NetworkChangeN otifierUtil.java', | 314 'cronet/android/test/src/org/chromium/cronet_test_apk/NetworkChangeN otifierUtil.java', | 
| 306 ], | 315 ], | 
| 307 'variables': { | 316 'variables': { | 
| 308 'jni_gen_package': 'cronet_tests', | 317 'jni_gen_package': 'cronet_tests', | 
| 309 }, | 318 }, | 
| 310 'includes': [ '../build/jni_generator.gypi' ], | 319 'includes': [ '../build/jni_generator.gypi' ], | 
| 311 }, | 320 }, | 
| 312 { | 321 { | 
| 313 'target_name': 'libcronet_tests', | 322 'target_name': 'libcronet_tests', | 
| 314 'type': 'shared_library', | 323 'type': 'shared_library', | 
| 315 'sources': [ | 324 'sources': [ | 
| 316 'cronet/android/test/cronet_test_jni.cc', | 325 'cronet/android/test/cronet_test_jni.cc', | 
| 317 'cronet/android/test/mock_url_request_job_factory.cc', | 326 'cronet/android/test/mock_url_request_job_factory.cc', | 
| 318 'cronet/android/test/mock_url_request_job_factory.h', | 327 'cronet/android/test/mock_url_request_job_factory.h', | 
| 319 'cronet/android/test/upload_test_server.cc', | 328 'cronet/android/test/upload_test_server.cc', | 
| 
 
mef
2015/02/03 22:08:23
is it still called upload_test_server?
 
xunjieli
2015/02/03 22:18:51
Oops. Will change it in a separate CL.
 
 | |
| 320 'cronet/android/test/upload_test_server.h', | 329 'cronet/android/test/upload_test_server.h', | 
| 330 'cronet/android/test/upload_data_stream_handler.cc', | |
| 331 'cronet/android/test/upload_data_stream_handler.h', | |
| 321 'cronet/android/test/network_change_notifier_util.cc', | 332 'cronet/android/test/network_change_notifier_util.cc', | 
| 322 'cronet/android/test/network_change_notifier_util.h', | 333 'cronet/android/test/network_change_notifier_util.h', | 
| 323 ], | 334 ], | 
| 324 'dependencies': [ | 335 'dependencies': [ | 
| 325 'cronet_static', | 336 'cronet_static', | 
| 326 'cronet_tests_jni_headers', | 337 'cronet_tests_jni_headers', | 
| 327 '../base/base.gyp:base', | 338 '../base/base.gyp:base', | 
| 328 '../net/net.gyp:net', | 339 '../net/net.gyp:net', | 
| 329 '../net/net.gyp:net_test_support', | 340 '../net/net.gyp:net_test_support', | 
| 330 '../net/net.gyp:quic_tools', | 341 '../net/net.gyp:quic_tools', | 
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 517 'files': [ | 528 'files': [ | 
| 518 '<(SHARED_LIB_DIR)/<(native_lib)', | 529 '<(SHARED_LIB_DIR)/<(native_lib)', | 
| 519 ], | 530 ], | 
| 520 }, | 531 }, | 
| 521 ], | 532 ], | 
| 522 }, | 533 }, | 
| 523 ], | 534 ], | 
| 524 }], # OS=="android" and use_icu_alternatives_on_android==1 | 535 }], # OS=="android" and use_icu_alternatives_on_android==1 | 
| 525 ], | 536 ], | 
| 526 } | 537 } | 
| OLD | NEW |