Chromium Code Reviews| Index: components/cronet.gypi |
| diff --git a/components/cronet.gypi b/components/cronet.gypi |
| index 8a51dbb3eaa9b6749d1a379393454f97a2737934..be6c45fc28bbeaf24a19f7aa12f8ffde473e8869 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', |
| ], |
| @@ -20,6 +22,14 @@ |
| 'includes': [ '../build/jni_generator.gypi' ], |
| }, |
| { |
| + 'target_name': 'cronet_url_request_java_enum', |
| + 'type': 'none', |
| + 'variables': { |
| + 'source_file': 'cronet/android/cronet_url_request.h', |
| + }, |
| + 'includes': [ '../build/android/java_cpp_enum.gypi' ], |
|
xunjieli
2014/10/28 14:24:19
nit: indent.
mef
2014/10/28 16:29:00
Done.
|
| + }, |
| + { |
| 'target_name': 'cronet_url_request_error_list', |
| 'type': 'none', |
| 'sources': [ |
| @@ -47,7 +57,7 @@ |
| '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,7 @@ |
| '../third_party/icu/icu.gyp:icuuc', |
| 'cronet_jni_headers', |
| 'cronet_url_request_context_config_list', |
| + 'cronet_url_request_java_enum', |
|
xunjieli
2014/10/28 14:24:19
nit:indent.
mef
2014/10/28 16:29:00
Done.
|
| 'cronet_url_request_error_list', |
| 'cronet_url_request_priority_list', |
| 'cronet_version', |
| @@ -128,6 +139,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', |
| @@ -186,18 +205,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', |
| ], |
| }, |
| @@ -211,6 +231,7 @@ |
| '../base/base.gyp:base', |
| 'cronet_stub', |
| 'cronet_url_request_error_list', |
| + 'cronet_url_request_java_enum', |
|
xunjieli
2014/10/28 14:24:19
nit: indent.
mef
2014/10/28 16:29:00
Done. Somehow I got tab characters into this file.
|
| 'cronet_url_request_priority_list', |
| 'libcronet', |
| ], |
| @@ -223,7 +244,10 @@ |
| '**/ChromiumUrlRequestError.java', |
| '**/ChromiumUrlRequestFactory.java', |
| '**/ChromiumUrlRequestPriority.java', |
| - '**/UsedByReflection.java', |
| + '**/CronetResponseInfo.java', |
| + '**/CronetUrlRequest.java', |
| + '**/CronetUrlRequestContext.java', |
| + '**/CronetUrlRequestFactory.java', |
| ], |
| }, |
| 'includes': [ '../build/java.gypi' ], |