Cronet API Refactoring

components/cronet/android/BUILD.gn

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/buildflag_header.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/util/process_version.gni")
 import("//build/util/version.gni")
 import("//testing/test.gni")
 import("//third_party/protobuf/proto_library.gni")
 import("//url/features.gni")
 
 assert(!is_component_build, "Cronet requires static library build.")
 
 declare_args() {
   cronet_enable_data_reduction_proxy_support = false
 }
 
 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",
     "java/src/org/chromium/net/impl/CronetUrlRequest.java",
     "java/src/org/chromium/net/impl/CronetUrlRequestContext.java",
   ]
   jni_package = "cronet"
 }
 
 java_cpp_enum("effective_connection_type_java") {
   sources = [
     "//net/nqe/effective_connection_type.h",
   ]
 }
 
-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",
   ]
 }
 
 java_cpp_enum("network_quality_observation_source_java") {
   sources = [
     "//net/nqe/network_quality_observation_source.h",
   ]
@@ skipping 18 matching lines @@
 }
 
 java_cpp_enum("http_cache_type_java") {
   sources = [
     "//components/cronet/url_request_context_config.h",
   ]
 }
 
 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 =
     "$target_gen_dir/templates/cronet_api_version_java"
 _generated_api_version_java =
     "$_generated_api_version_java_dir/org/chromium/net/ApiVersion.java"
 
 process_version("cronet_api_version_java") {
   template_file = "api/src/org/chromium/net/ApiVersion.template"
   sources = [
@@ skipping 64 matching lines @@
 }
 
 # Variables:
 #   defines: Extra defines.
 #   deps: Extra dependencies.
 template("cronet_static_tmpl") {
   source_set(target_name) {
     defines = []
 
     deps = [
-      ":chromium_url_request_java",
       ":cronet_android_cert_proto",
       ":cronet_jni_headers",
       ":cronet_version_header",
       "//base",
       "//base/third_party/dynamic_annotations",
       "//components/metrics",
       "//components/prefs",
       "//url:url_features",
     ]
     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",
       "//components/cronet/android/cronet_in_memory_pref_store.h",
       "//components/cronet/android/cronet_library_loader.cc",
       "//components/cronet/android/cronet_library_loader.h",
       "//components/cronet/android/cronet_upload_data_stream.cc",
       "//components/cronet/android/cronet_upload_data_stream.h",
       "//components/cronet/android/cronet_upload_data_stream_adapter.cc",
       "//components/cronet/android/cronet_upload_data_stream_adapter.h",
@@ skipping 83 matching lines @@
   # ARM64 linker throws an error for multiple version scripts with anonymous
   # version tags.
   configs -= [ "//build/config/android:hide_native_jni_exports" ]
 }
 
 # cronet_api.jar defines Cronet API and provides implementation of
 # legacy api using HttpUrlConnection (not the Chromium stack).
 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:
  cronet_api_srcjar_deps = [ ":cronet_api_version_srcjar" ]
and then here say:
  srcjar_deps = cronet_api_srcjar_deps
and also do the same in jar_cronet_api_source target?

[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",
     "java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java",
     "java/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandler.java",
     "java/src/org/chromium/net/urlconnection/CronetInputStream.java",
     "java/src/org/chromium/net/urlconnection/CronetOutputStream.java",
     "java/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactory.java",
     "java/src/org/chromium/net/urlconnection/MessageLoop.java",
   ]
 
   deps = [
     ":cronet_api",
     "//base:base_java",
     "//net/android:net_java",
     "//third_party/android_tools:android_support_annotations_java",
     "//third_party/jsr-305:jsr_305_javalib",
   ]
 
   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
 }
 
 android_resources("cronet_sample_apk_resources") {
   resource_dirs = [ "sample/res" ]
   android_manifest = "sample/AndroidManifest.xml"
 }
 
@@ skipping 233 matching lines @@
 
   run_findbugs_override = true
 }
 
 android_library("cronet_javatests") {
   testonly = true
 
   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",
     "test/javatests/src/org/chromium/net/QuicTest.java",
     "test/javatests/src/org/chromium/net/RequestFinishedInfoTest.java",
     "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",
     "test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java",
     "test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandlerTest.java",
     "test/javatests/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactoryTest.java",
     "test/javatests/src/org/chromium/net/urlconnection/MessageLoopTest.java",
     "test/javatests/src/org/chromium/net/urlconnection/QuicUploadTest.java",
     "test/javatests/src/org/chromium/net/urlconnection/TestUtil.java",
     "test/javatests/src/org/chromium/net/UrlResponseInfoTest.java",
@@ skipping 223 matching lines @@
     inputs = _src_jars
     inputs += _src_files
     inputs += _src_list_files
   }
 }
 
 jar_src("jar_cronet_api_source") {
   src_search_dirs = [ "api/src" ]
 
   # Include generated Java files which should be a part of the API.
   srcjar_deps = [ ":effective_connection_type_java" ]

[pauljensen, 2016/09/22 17:34:31]

I don't think effective_connection_type_java should be in the API srcjar as it's
not in the API anymore.  Anyhow, as I recommended above we could make this
simply:
 srcjar_deps = cronet_api_srcjar_deps

[kapishnikov, 2016/09/22 21:32:04]

Done.

   source_deps = [ ":cronet_api" ]
   jar_path = "$_package_dir/cronet_api-src.jar"
 }
 
 zip("jar_cronet_sample_source") {
   inputs = [
     "sample/AndroidManifest.xml",
     "sample/javatests/AndroidManifest.xml",
     "sample/javatests/proguard.cfg",
     "sample/javatests/src/org/chromium/cronet_sample_apk/Criteria.java",
@@ skipping 164 matching lines @@
       ":jar_cronet_api_source",
       ":jar_cronet_other_source",
       ":jar_cronet_sample_source",
       ":repackage_extracted_jars",
     ]
     if (current_cpu == "arm" && arm_version == 7) {
       deps += [ ":enforce_no_neon" ]
     }
   }
 }