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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/cronet/android/BUILD.gn

Issue 2339223002: Cronet API Refactoring (Closed)
Patch Set: Rebase Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/cronet/android/api/src/org/chromium/net/BidirectionalStream.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/android/BUILD.gn
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index 42ac2fed9ca0eb8656f40c43a168505452ab7e66..6ead9fdf3c8d666e4a7bd72ba8b5d40bfe28efe4 100644
--- a/components/cronet/android/BUILD.gn
+++ b/components/cronet/android/BUILD.gn
@@ -19,8 +19,6 @@ declare_args() {
generate_jni("cronet_jni_headers") {
sources = [
- "java/src/org/chromium/net/impl/ChromiumUrlRequest.java",
- "java/src/org/chromium/net/impl/ChromiumUrlRequestContext.java",
"java/src/org/chromium/net/impl/CronetBidirectionalStream.java",
"java/src/org/chromium/net/impl/CronetLibraryLoader.java",
"java/src/org/chromium/net/impl/CronetUploadDataStream.java",
@@ -36,12 +34,6 @@ java_cpp_enum("effective_connection_type_java") {
]
}
-java_cpp_enum("chromium_url_request_java") {
- sources = [
- "chromium_url_request.h",
- ]
-}
-
java_cpp_enum("net_request_priority_java") {
sources = [
"//net/base/request_priority.h",
@@ -80,12 +72,12 @@ java_cpp_enum("http_cache_type_java") {
java_cpp_template("load_states_list") {
sources = [
- "java/src/org/chromium/net/LoadState.template",
+ "java/src/org/chromium/net/impl/LoadState.template",
]
inputs = [
"//net/base/load_states_list.h",
]
- package_name = "org/chromium/net"
+ package_name = "org/chromium/net/impl"
}
_generated_api_version_java_dir =
@@ -170,7 +162,6 @@ template("cronet_static_tmpl") {
defines = []
deps = [
- ":chromium_url_request_java",
":cronet_android_cert_proto",
":cronet_jni_headers",
":cronet_version_header",
@@ -183,10 +174,6 @@ template("cronet_static_tmpl") {
sources = [
"//components/cronet/android/cert/cert_verifier_cache_serializer.cc",
"//components/cronet/android/cert/cert_verifier_cache_serializer.h",
- "//components/cronet/android/chromium_url_request.cc",
- "//components/cronet/android/chromium_url_request.h",
- "//components/cronet/android/chromium_url_request_context.cc",
- "//components/cronet/android/chromium_url_request_context.h",
"//components/cronet/android/cronet_bidirectional_stream_adapter.cc",
"//components/cronet/android/cronet_bidirectional_stream_adapter.h",
"//components/cronet/android/cronet_in_memory_pref_store.cc",
@@ -290,60 +277,52 @@ shared_library("cronet") {
android_library("cronet_api") {
java_files = [
"api/src/org/chromium/net/BidirectionalStream.java",
- "api/src/org/chromium/net/ChunkedWritableByteChannel.java",
"api/src/org/chromium/net/CronetEngine.java",
"api/src/org/chromium/net/CronetException.java",
- "api/src/org/chromium/net/HttpUrlConnectionUrlRequest.java",
- "api/src/org/chromium/net/HttpUrlConnectionUrlRequestFactory.java",
- "api/src/org/chromium/net/HttpUrlRequest.java",
- "api/src/org/chromium/net/HttpUrlRequestFactory.java",
- "api/src/org/chromium/net/HttpUrlRequestListener.java",
+ "api/src/org/chromium/net/ICronetEngineBuilder.java",
+ "api/src/org/chromium/net/ExperimentalBidirectionalStream.java",
+ "api/src/org/chromium/net/ExperimentalCronetEngine.java",
+ "api/src/org/chromium/net/ExperimentalUrlRequest.java",
"api/src/org/chromium/net/InlineExecutionProhibitedException.java",
- "api/src/org/chromium/net/InputStreamChannel.java",
- "api/src/org/chromium/net/JavaCronetEngine.java",
- "api/src/org/chromium/net/JavaUrlRequest.java",
"api/src/org/chromium/net/NetworkQualityRttListener.java",
"api/src/org/chromium/net/NetworkQualityThroughputListener.java",
- "api/src/org/chromium/net/Preconditions.java",
"api/src/org/chromium/net/QuicException.java",
"api/src/org/chromium/net/RequestFinishedInfo.java",
- "api/src/org/chromium/net/ResponseTooLargeException.java",
"api/src/org/chromium/net/UploadDataProvider.java",
"api/src/org/chromium/net/UploadDataProviders.java",
"api/src/org/chromium/net/UploadDataSink.java",
"api/src/org/chromium/net/UrlRequest.java",
"api/src/org/chromium/net/UrlRequestException.java",
"api/src/org/chromium/net/UrlResponseInfo.java",
- "api/src/org/chromium/net/UserAgent.java",
]
deps = [
"//third_party/android_tools:android_support_annotations_java",
]
- srcjar_deps = [
- ":cronet_api_version_srcjar",
- ":effective_connection_type_java",
- ":http_cache_type_java",
- ":url_request_error_java",
- ":load_states_list",
- ":network_quality_observation_source_java",
- ]
+ srcjar_deps = [ ":cronet_api_version_srcjar" ]
pauljensen 2016/09/22 17:34:31 can we create a new top level variable like so:
kapishnikov 2016/09/22 21:32:03 Done.
run_findbugs_override = true
}
android_library("cronet_java") {
java_files = [
- "java/src/org/chromium/net/impl/ChromiumUrlRequest.java",
- "java/src/org/chromium/net/impl/ChromiumUrlRequestContext.java",
- "java/src/org/chromium/net/impl/ChromiumUrlRequestFactory.java",
+ "java/src/org/chromium/net/impl/BidirectionalStreamBuilderImpl.java",
"java/src/org/chromium/net/impl/CronetBidirectionalStream.java",
+ "java/src/org/chromium/net/impl/CronetEngineBase.java",
+ "java/src/org/chromium/net/impl/CronetEngineBuilderImpl.java",
"java/src/org/chromium/net/impl/CronetLibraryLoader.java",
"java/src/org/chromium/net/impl/CronetMetrics.java",
"java/src/org/chromium/net/impl/CronetUploadDataStream.java",
"java/src/org/chromium/net/impl/CronetUrlRequest.java",
"java/src/org/chromium/net/impl/CronetUrlRequestContext.java",
+ "java/src/org/chromium/net/impl/InputStreamChannel.java",
+ "java/src/org/chromium/net/impl/JavaCronetEngine.java",
+ "java/src/org/chromium/net/impl/JavaUrlRequest.java",
+ "java/src/org/chromium/net/impl/Preconditions.java",
+ "java/src/org/chromium/net/impl/UrlRequestBase.java",
+ "java/src/org/chromium/net/impl/UrlRequestBuilderImpl.java",
+ "java/src/org/chromium/net/impl/UserAgent.java",
"java/src/org/chromium/net/urlconnection/CronetBufferedOutputStream.java",
"java/src/org/chromium/net/urlconnection/CronetChunkedOutputStream.java",
"java/src/org/chromium/net/urlconnection/CronetFixedModeOutputStream.java",
@@ -365,8 +344,12 @@ android_library("cronet_java") {
srcjar_deps = [
":cronet_impl_version_srcjar",
- ":chromium_url_request_java",
+ ":effective_connection_type_java",
+ ":http_cache_type_java",
+ ":load_states_list",
":net_request_priority_java",
+ ":network_quality_observation_source_java",
+ ":url_request_error_java",
]
run_findbugs_override = true
@@ -620,18 +603,13 @@ android_library("cronet_javatests") {
java_files = [
"test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java",
"test/javatests/src/org/chromium/net/BidirectionalStreamTest.java",
- "test/javatests/src/org/chromium/net/ChromiumUrlRequestTest.java",
- "test/javatests/src/org/chromium/net/ChunkedWritableByteChannelTest.java",
- "test/javatests/src/org/chromium/net/ContextInitTest.java",
"test/javatests/src/org/chromium/net/Criteria.java",
"test/javatests/src/org/chromium/net/CronetTestBase.java",
"test/javatests/src/org/chromium/net/CronetUploadTest.java",
"test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java",
"test/javatests/src/org/chromium/net/CronetUrlRequestTest.java",
- "test/javatests/src/org/chromium/net/CronetUrlTest.java",
"test/javatests/src/org/chromium/net/DiskStorageTest.java",
"test/javatests/src/org/chromium/net/GetStatusTest.java",
- "test/javatests/src/org/chromium/net/HttpUrlRequestFactoryTest.java",
"test/javatests/src/org/chromium/net/MetricsTestUtil.java",
"test/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java",
"test/javatests/src/org/chromium/net/PkpTest.java",
@@ -640,13 +618,11 @@ android_library("cronet_javatests") {
"test/javatests/src/org/chromium/net/SdchTest.java",
"test/javatests/src/org/chromium/net/TestBidirectionalStreamCallback.java",
"test/javatests/src/org/chromium/net/TestDrivenDataProvider.java",
- "test/javatests/src/org/chromium/net/TestHttpUrlRequestListener.java",
"test/javatests/src/org/chromium/net/TestNetworkQualityRttListener.java",
"test/javatests/src/org/chromium/net/TestNetworkQualityThroughputListener.java",
"test/javatests/src/org/chromium/net/TestUploadDataProvider.java",
"test/javatests/src/org/chromium/net/TestUrlRequestCallback.java",
"test/javatests/src/org/chromium/net/UploadDataProvidersTest.java",
- "test/javatests/src/org/chromium/net/UploadTest.java",
"test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java",
"test/javatests/src/org/chromium/net/urlconnection/CronetChunkedOutputStreamTest.java",
"test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java",
« no previous file with comments | « no previous file | components/cronet/android/api/src/org/chromium/net/BidirectionalStream.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698