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")
@@ skipping 22 matching lines @@
     "//net/nqe/effective_connection_type.h",
   ]
 }
 
 java_cpp_enum("rtt_throughput_values_java") {
   sources = [
     "//net/nqe/network_quality.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",
   ]
 }
 
 java_cpp_enum("url_request_error_java") {
   sources = [
     "url_request_error.h",
   ]
 }
 
-# This target is a jar file containing classes that Cronet's javadocs
-# may reference but are not included in the javadocs themselves.
-android_library("cronet_javadoc_classpath") {
-  deps = [
-    "//third_party/android_tools:android_support_annotations_java",
-  ]
-  srcjar_deps = [
-    ":effective_connection_type_java",
-    ":rtt_throughput_values_java",
-    ":url_request_error_java",
-  ]
-}
-
 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.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 74 matching lines @@
   ]
   ldflags = [ "-Wl,--version-script=" +
               rebase_path("//components/cronet/android/only_jni_exports.lst") ]
 
   # Avoid hide_native_jni_exports as it adds another version script, and the
   # 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).
+cronet_api_srcjar_deps = [ ":cronet_api_version_srcjar" ]
+
+# cronet_api.jar defines Cronet API.
 android_library("cronet_api") {
   java_files = [
     "api/src/org/chromium/net/BidirectionalStream.java",
     "api/src/org/chromium/net/CronetEngine.java",
     "api/src/org/chromium/net/CronetException.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/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",
-    ":rtt_throughput_values_java",
-    ":http_cache_type_java",
-    ":url_request_error_java",
-    ":load_states_list",
-    ":network_quality_observation_source_java",
-  ]
+  srcjar_deps = cronet_api_srcjar_deps
 
   run_findbugs_override = true
 }
 
-android_library("cronet_java") {
+cronet_impl_common_java_srcjar_deps = [
+  ":cronet_impl_version_srcjar",
+  ":effective_connection_type_java",
+  ":http_cache_type_java",
+  ":load_states_list",
+  ":rtt_throughput_values_java",
+]
+
+# cronet_impl_common_java.jar - common Cronet code that is shared
+# by all Cronet engine implementations.
+android_library("cronet_impl_common_java") {
   java_files = [
+    "java/src/org/chromium/net/impl/CronetEngineBase.java",
+    "java/src/org/chromium/net/impl/CronetEngineBuilderImpl.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",
+  ]
+
+  deps = [
+    ":cronet_api",
+    "//third_party/android_tools:android_support_annotations_java",
+  ]
+
+  srcjar_deps = cronet_impl_common_java_srcjar_deps
+}
+
+# cronet_impl_platform_java.jar - Java platform based implementation of the Cronet engine.
+android_library("cronet_impl_platform_java") {
+  java_files = [
+    "java/src/org/chromium/net/impl/InputStreamChannel.java",
+    "java/src/org/chromium/net/impl/JavaCronetEngine.java",
+    "java/src/org/chromium/net/impl/JavaUrlRequest.java",
+  ]
+
+  deps = [
+    ":cronet_api",
+    ":cronet_impl_common_java",
+  ]
+}
+
+cronet_impl_native_java_srcjar_deps = [
+  ":net_request_priority_java",
+  ":network_quality_observation_source_java",
+  ":url_request_error_java",
+]
+
+# cronet_impl_native_java.jar - native implementation of the Cronet engine.
+android_library("cronet_impl_native_java") {
+  java_files = [
+    "java/src/org/chromium/net/impl/BidirectionalStreamBuilderImpl.java",
     "java/src/org/chromium/net/impl/CronetBidirectionalStream.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/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",
+    ":cronet_impl_common_java",
     "//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",
-    ":net_request_priority_java",
+  srcjar_deps = cronet_impl_native_java_srcjar_deps
+}
+
+# Groups all Cronet implementations and the common code into a single Java dependency.
+java_group("cronet_impl_all_java") {
+  deps = [
+    ":cronet_impl_common_java",
+    ":cronet_impl_native_java",
+    ":cronet_impl_platform_java",
   ]
-
-  run_findbugs_override = true
 }
 
 android_resources("cronet_sample_apk_resources") {
   resource_dirs = [ "sample/res" ]
   android_manifest = "sample/AndroidManifest.xml"
+  deps = [
+    "//third_party/android_tools:android_support_v7_appcompat_java",
+  ]
 }
 
 android_library("cronet_sample_apk_java") {
   java_files = [
     "sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java",
     "sample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java",
   ]
 
   deps = [
     ":cronet_api",
-    ":cronet_java",
+    ":cronet_impl_all_java",
     ":cronet_sample_apk_resources",
     "//base:base_java",
+    "//third_party/android_tools:android_support_v7_appcompat_java",
   ]
 
   run_findbugs_override = true
 }
 
 android_apk("cronet_sample_apk") {
   apk_name = "CronetSample"
   android_manifest = "sample/AndroidManifest.xml"
   shared_libraries = [ ":cronet" ]
 
@@ skipping 29 matching lines @@
   apk_name = "CronetSampleTest"
   apk_under_test = ":cronet_sample_apk"
   android_manifest = "sample/javatests/AndroidManifest.xml"
   java_files = [
     "sample/javatests/src/org/chromium/cronet_sample_apk/Criteria.java",
     "sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java",
   ]
 
   deps = [
     ":cronet_api",
-    ":cronet_java",
+    ":cronet_impl_all_java",
     ":cronet_sample_apk_java",
     ":cronet_sample_test_apk_resources",
     "//base:base_java",
     "//base:base_java_test_support",
     "//net/android:net_java_test_support",
   ]
   additional_apks = [ "//net/android:net_test_support_apk" ]
 
   run_findbugs_override = true
   proguard_enabled = !is_java_debug
@@ skipping 87 matching lines @@
     "test/src/org/chromium/net/NativeTestServer.java",
     "test/src/org/chromium/net/NetworkChangeNotifierUtil.java",
     "test/src/org/chromium/net/QuicTestServer.java",
     "test/src/org/chromium/net/SdchObserver.java",
     "test/src/org/chromium/net/TestFilesInstaller.java",
     "test/src/org/chromium/net/TestUploadDataStreamHandler.java",
   ]
 
   deps = [
     ":cronet_api",
-    ":cronet_java",
+    ":cronet_impl_all_java",
     "//base:base_java",
     "//base:base_java_test_support",
     "//net/android:net_java_test_support",
     "//third_party/netty-tcnative:netty-tcnative",
     "//third_party/netty4:netty_all",
   ]
 
   run_findbugs_override = true
 }
 
@@ skipping 88 matching lines @@
     "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",
   ]
 
   deps = [
     ":cronet_api",
-    ":cronet_java",
+    ":cronet_impl_all_java",
     ":cronet_test_apk_java",
     "//base:base_java",
     "//base:base_java_test_support",
     "//net/android:net_java",
     "//net/android:net_java_test_support",
   ]
 
   run_findbugs_override = true
 }
 
 instrumentation_test_apk("cronet_test_instrumentation_apk") {
   apk_name = "CronetTestInstrumentation"
   apk_under_test = ":cronet_test_apk"
   android_manifest = "test/javatests/AndroidManifest.xml"
 
   deps = [
     ":cronet_api",
-    ":cronet_java",
+    ":cronet_impl_all_java",
     ":cronet_javatests",
     ":cronet_test_apk_java",
     "//base:base_java",
     "//base:base_java_test_support",
     "//net/android:net_java",
     "//net/android:net_java_test_support",
   ]
   additional_apks = [ "//net/android:net_test_support_apk" ]
 
   data_deps = [
     "//net:test_support",
   ]
 
   run_findbugs_override = true
 }
 
 android_library("cronet_perf_test_apk_java") {
   testonly = true
   java_files =
       [ "test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java" ]
 
   deps = [
     ":cronet_api",
-    ":cronet_java",
+    ":cronet_impl_all_java",
     ":cronet_javatests",
     ":cronet_test_apk_java",
     "//base:base_java",
   ]
 
   run_findbugs_override = true
 }
 
 android_apk("cronet_perf_test_apk") {
   testonly = true
@@ skipping 45 matching lines @@
 _package_dir = "$root_out_dir/cronet"
 _extract_cronet_jars_dir = "$target_gen_dir/cronet_jar_extract"
 
 action("extract_cronet_jars") {
   # extract_from_jars.py deletes the target directory before extracting.
   script = "//components/cronet/tools/extract_from_jars.py"
   depfile = "$target_gen_dir/$target_name.d"
 
   sources = [
     "$root_out_dir/lib.java/base/base_java.jar",
-    "$root_out_dir/lib.java/components/cronet/android/cronet_java.jar",
+    "$root_out_dir/lib.java/components/cronet/android/cronet_impl_native_java.jar",
     "$root_out_dir/lib.java/net/android/net_java.jar",
     "$root_out_dir/lib.java/url/url_java.jar",
   ]
 
   _stamp_file = "$target_gen_dir/$target_name.stamp"
   outputs = [
     _stamp_file,
   ]
 
   _rebased_sources = rebase_path(sources, root_build_dir)
 
   args = [
     "--classes-dir",
     rebase_path(_extract_cronet_jars_dir, root_build_dir),
     "--jars=${_rebased_sources}",
     "--depfile",
     rebase_path(depfile, root_build_dir),
     "--stamp",
     rebase_path(_stamp_file, root_build_dir),
   ]
 
   deps = [
-    ":cronet_java",
+    ":cronet_impl_native_java",
     "//base:base_java",
     "//net/android:net_java",
     "//url:url_java",
   ]
 }
 
 action("repackage_extracted_jars") {
-  _output_jar = "$_package_dir/cronet.jar"
+  _output_jar = "$_package_dir/cronet_impl_native_java.jar"
 
   script = "//build/android/gyp/jar.py"
   outputs = [
     _output_jar,
   ]
 
   args = [
     "--classes-dir",
     rebase_path(_extract_cronet_jars_dir, root_build_dir),
     "--jar-path",
@@ skipping 67 matching lines @@
     args += [ "--src-list-files=${_src_list_files}" ]
 
     inputs = _src_jars
     inputs += _src_files
     inputs += _src_list_files
   }
 }
 
 jar_src("jar_cronet_api_source") {
   src_search_dirs = [ "api/src" ]
+  source_deps = [ ":cronet_api" ]
+  srcjar_deps = cronet_api_srcjar_deps
+  jar_path = "$_package_dir/cronet_api-src.jar"
+}
 
-  # Include generated Java files which should be a part of the API.
-  srcjar_deps = [
-    ":effective_connection_type_java",
-    ":rtt_throughput_values_java",
-  ]
-  source_deps = [ ":cronet_api" ]
-  jar_path = "$_package_dir/cronet_api-src.jar"
+jar_src("jar_cronet_impl_common_java_source") {
+  src_search_dirs = [ "java/src" ]
+  source_deps = [ ":cronet_impl_common_java" ]
+  srcjar_deps = cronet_impl_common_java_srcjar_deps
+  jar_path = "$_package_dir/cronet_impl_common_java-src.jar"
+}
+
+jar_src("jar_cronet_impl_platform_java_source") {
+  src_search_dirs = [ "java/src" ]
+  source_deps = [ ":cronet_impl_platform_java" ]
+  jar_path = "$_package_dir/cronet_impl_platform_java-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",
     "sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java",
     "sample/README",
     "sample/res/layout/activity_main.xml",
     "sample/res/layout/dialog_url.xml",
     "sample/res/values/dimens.xml",
     "sample/res/values/strings.xml",
     "sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java",
     "sample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java",
   ]
   output = "$_package_dir/cronet-sample-src.jar"
   base_dir = "sample"
 }
 
-jar_src("jar_cronet_other_source") {
+jar_src("jar_cronet_impl_native_java_source") {
   src_search_dirs = [
     "//base/android/java/src",
     "//components/cronet/android/java/src",
     "//net/android/java/src",
     "//url/android/java/src",
   ]
   source_deps = [
-    ":cronet_java",
+    ":cronet_impl_native_java",
     "//base:base_java",
     "//net/android:net_java",
     "//url:url_java",
   ]
-  jar_path = "$_package_dir/cronet-src.jar"
+  srcjar_deps = cronet_impl_native_java_srcjar_deps + [
+                  "//base:base_android_java_enums_srcjar",
+                  "//net/android:net_android_java_enums_srcjar",
+                  "//net/android:net_errors_java",
+                ]
+  jar_path = "$_package_dir/cronet_impl_native_java-src.jar"
 }
 
 action("generate_licenses") {
   _license_path = "$_package_dir/LICENSE"
 
   script = "//components/cronet/tools/cronet_licenses.py"
   outputs = [
     _license_path,
   ]
   args = [
@@ skipping 24 matching lines @@
     rebase_path(_stamp_file, root_build_dir),
     "--lib-java-dir",
     rebase_path("$root_build_dir/lib.java/components/cronet/android",
                 root_build_dir),
 
     # JavaDoc is generated from Cronet's API source jar.
     "--input-src-jar",
     rebase_path("$_package_dir/cronet_api-src.jar", root_build_dir),
   ]
   deps = [
-    ":cronet_javadoc_classpath",
     ":jar_cronet_api_source",
   ]
 }
 
 copy("cronet_package_copy") {
   sources = [
     "$root_out_dir/lib.java/components/cronet/android/cronet_api.jar",
+    "$root_out_dir/lib.java/components/cronet/android/cronet_impl_common_java.jar",
+    "$root_out_dir/lib.java/components/cronet/android/cronet_impl_platform_java.jar",
     "//AUTHORS",
     "//chrome/VERSION",
   ]
   outputs = [
     "$_package_dir/{{source_file_part}}",
   ]
 
   deps = [
     ":cronet_api",
+    ":cronet_impl_common_java",
+    ":cronet_impl_platform_java",
   ]
 }
 
 action("cronet_combine_proguard_flags") {
   script = "//components/cronet/tools/generate_proguard_file.py"
   outputs = [
     "$_package_dir/proguard.cfg",
   ]
 
   args = [
@@ skipping 57 matching lines @@
   # not including any deps in cronet_package target otherwise.
   if (!(target_cpu == "arm" && arm_version == 7) || !arm_use_neon) {
     deps = [
       ":cronet_combine_proguard_flags",
       ":cronet_package_copy",
       ":cronet_package_copy_native_lib",
       ":cronet_package_copy_native_lib_unstripped",
       ":generate_javadoc",
       ":generate_licenses",
       ":jar_cronet_api_source",
-      ":jar_cronet_other_source",
+      ":jar_cronet_impl_common_java_source",
+      ":jar_cronet_impl_native_java_source",
+      ":jar_cronet_impl_platform_java_source",
       ":jar_cronet_sample_source",
       ":repackage_extracted_jars",
     ]
     if (current_cpu == "arm" && arm_version == 7) {
       deps += [ ":enforce_no_neon" ]
     }
   }
 }