Index: components/cronet.gypi |
diff --git a/components/cronet.gypi b/components/cronet.gypi |
index 53791155eacae7225bcbd901dba3ccbc8e840e01..a2ef73e97763cb6960e70e58d1f17555106643a4 100644 |
--- a/components/cronet.gypi |
+++ b/components/cronet.gypi |
@@ -11,6 +11,8 @@ |
'target_name': 'cronet_jni_headers', |
'type': 'none', |
'sources': [ |
+ 'cronet/android/java/src/org/chromium/net/CronetUrlRequest.java', |
+ 'cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java', |
'cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java', |
'cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext.java', |
], |
@@ -28,10 +30,18 @@ |
'includes': [ '../build/android/java_cpp_enum.gypi' ], |
}, |
{ |
+ 'target_name': 'net_request_priority_java', |
+ 'type': 'none', |
+ 'variables': { |
+ 'source_file': '../net/base/request_priority.h', |
+ }, |
+ 'includes': [ '../build/android/java_cpp_enum.gypi' ], |
+ }, |
+ { |
'target_name': 'cronet_url_request_context_config_list', |
'type': 'none', |
'sources': [ |
- 'cronet/android/java/src/org/chromium/net/UrlRequestContextConfig.template', |
+ 'cronet/android/java/src/org/chromium/net/UrlRequestContextConfigList.template', |
], |
'variables': { |
'package_name': 'org/chromium/cronet', |
@@ -111,6 +121,14 @@ |
'cronet/android/chromium_url_request_context.h', |
'cronet/android/cronet_loader.cc', |
'cronet/android/cronet_loader.h', |
+ 'cronet/android/cronet_url_request.cc', |
+ 'cronet/android/cronet_url_request.h', |
+ 'cronet/android/cronet_url_request_adapter.cc', |
+ 'cronet/android/cronet_url_request_adapter.h', |
+ 'cronet/android/cronet_url_request_context.cc', |
+ 'cronet/android/cronet_url_request_context.h', |
+ 'cronet/android/cronet_url_request_context_adapter.cc', |
+ 'cronet/android/cronet_url_request_context_adapter.h', |
'cronet/android/url_request_adapter.cc', |
'cronet/android/url_request_adapter.h', |
'cronet/android/url_request_context_adapter.cc', |
@@ -169,18 +187,19 @@ |
'variables': { |
'java_in_dir': 'cronet/android/java', |
'javac_includes': [ |
- '**/AsyncUrlRequest.java', |
- '**/AsyncUrlRequestException.java', |
- '**/AsyncUrlRequestFactory.java', |
- '**/AsyncUrlRequestListener.java', |
- '**/ResponseInfo.java', |
'**/ChunkedWritableByteChannel.java', |
+ '**/ExtendedResponseInfo.java', |
'**/HttpUrlConnection*.java', |
'**/HttpUrlRequest*.java', |
+ '**/ResponseInfo.java', |
'**/ResponseTooLargeException.java', |
- '**/UserAgent.java', |
- # TODO(mef): Consider moving this into HttpUrlRequestConfig. |
+ '**/UrlRequest.java', |
+ '**/UrlRequestContext.java', |
'**/UrlRequestContextConfig.java', |
+ '**/UrlRequestContextConfigList.java', |
+ '**/UrlRequestException.java', |
+ '**/UrlRequestListener.java', |
+ '**/UserAgent.java', |
'**/Version.java', |
], |
}, |
@@ -195,6 +214,7 @@ |
'cronet_stub', |
'cronet_url_request_java', |
'libcronet', |
+ 'net_request_priority_java', |
], |
'variables': { |
'java_in_dir': 'cronet/android/java', |
@@ -205,7 +225,11 @@ |
'**/ChromiumUrlRequestError.java', |
'**/ChromiumUrlRequestFactory.java', |
'**/ChromiumUrlRequestPriority.java', |
- '**/UsedByReflection.java', |
+ '**/CronetResponseInfo.java', |
+ '**/CronetUrlRequest.java', |
+ '**/CronetUrlRequestContext.java', |
+ '**/CronetUrlRequestFactory.java', |
+ '**/RequestPriority.java', |
], |
}, |
'includes': [ '../build/java.gypi' ], |