unplugged-system/external/cronet/patches/0006-Remove-Java-fallback-implementation-of-Cronet-APIs.patch

From 9e8558e426ef98ed58774f618b7841ea0d92c3ae Mon Sep 17 00:00:00 2001
From: Dan Stahr <danstahr@google.com>
Date: Tue, 3 Jan 2023 16:33:27 +0000
Subject: [PATCH] Remove Java fallback implementation of Cronet APIs.

Test: m

Change-Id: Ie119db4827f3e4029b244a6e7b3337f8b38d7b07
---
 components/cronet/android/BUILD.gn | 53 ------------------------------
 1 file changed, 53 deletions(-)

diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index b791a015060d8..2c6ec12c05eb1 100644
--- a/components/cronet/android/BUILD.gn
+++ b/components/cronet/android/BUILD.gn
@@ -331,38 +331,6 @@ android_library("cronet_impl_common_base_java") {
   srcjar_deps = cronet_impl_common_java_srcjar_deps
 }
 
-# cronet_impl_java_util_java.jar - Classes shared between Java Cronet implementations.
-android_library("cronet_impl_java_util_java") {
-  sources = [
-    "java/src/org/chromium/net/impl/JavaUploadDataSinkBase.java",
-    "java/src/org/chromium/net/impl/JavaUrlRequestUtils.java",
-  ]
-
-  deps = [
-    ":cronet_api_java",
-    "//third_party/androidx:androidx_annotation_annotation_java",
-  ]
-}
-
-# cronet_impl_platform_base_java.jar - Java platform based implementation of the Cronet engine.
-android_library("cronet_impl_platform_base_java") {
-  sources = [
-    "java/src/org/chromium/net/impl/InputStreamChannel.java",
-    "java/src/org/chromium/net/impl/JavaCronetEngine.java",
-    "java/src/org/chromium/net/impl/JavaCronetEngineBuilderImpl.java",
-    "java/src/org/chromium/net/impl/JavaUrlRequest.java",
-  ]
-
-  deps = [
-    ":cronet_api_java",
-    ":cronet_impl_common_base_java",
-    ":cronet_impl_java_util_java",
-    "//net/android:net_thread_stats_uid_java",
-    "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
-    "//third_party/androidx:androidx_annotation_annotation_java",
-  ]
-}
-
 # cronet_impl_fake_base_java.jar - Fake implementation of Cronet.
 android_library("cronet_impl_fake_base_java") {
   sources = [
@@ -452,7 +420,6 @@ java_group("cronet_impl_all_java") {
   deps = [
     ":cronet_impl_common_base_java",
     ":cronet_impl_native_base_java",
-    ":cronet_impl_platform_base_java",
   ]
 }
 
@@ -696,12 +663,6 @@ jar_src("jar_cronet_impl_common_java_source") {
   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_base_java" ]
-  jar_path = "$_package_dir/cronet_impl_platform_java-src.jar"
-}
-
 jar_src("jar_cronet_impl_fake_java_source") {
   src_search_dirs = [ "fake/java" ]
   source_deps = [ ":cronet_impl_fake_base_java" ]
@@ -757,11 +718,6 @@ repackage_jars("repackage_api") {
   deps = [ ":cronet_api_java" ]
 }
 
-repackage_jars("repackage_platform") {
-  output = "$_package_dir/cronet_impl_platform_java.jar"
-  deps = [ ":cronet_impl_platform_base_java" ]
-}
-
 repackage_jars("repackage_fake") {
   output = "$_package_dir/cronet_impl_fake_java.jar"
   deps = [ ":cronet_impl_fake_base_java" ]
@@ -1017,7 +973,6 @@ android_library("cronet_fake_javatests") {
            ":cronet_common_javatests",
            ":cronet_impl_common_base_java",
            ":cronet_impl_fake_base_java",
-           ":cronet_impl_platform_base_java",
            "//base:base_java_test_support",
            "//third_party/android_sdk:android_test_base_java",
            "//third_party/junit",
@@ -1189,7 +1144,6 @@ instrumentation_test_apk(
   deps = [
            ":cronet_api_java",
            ":cronet_impl_common_base_java",
-           ":cronet_impl_platform_base_java",
            ":cronet_smoketests_platform_only_apk_resources",
            "//base:base_java_test_support",
            "//third_party/android_sdk:android_test_base_java",
@@ -1220,7 +1174,6 @@ instrumentation_test_apk(
            ":cronet_api_java",
            ":cronet_combine_proguard_flags",
            ":cronet_impl_common_base_java",
-           ":cronet_impl_platform_base_java",
            ":cronet_test_apk_java",
            ":cronet_test_apk_resources",
            "//base:base_java",
@@ -1529,7 +1482,6 @@ copy("cronet_package_copy") {
     ":cronet_combine_proguard_flags",
     ":cronet_impl_common_base_java",
     ":cronet_impl_fake_base_java",
-    ":cronet_impl_platform_base_java",
   ]
 }
 
@@ -1646,7 +1598,6 @@ action("api_static_checks") {
   outputs = [ "$target_gen_dir/$target_name.stamp" ]
   _api_jar = "$target_out_dir/cronet_api_java.processed.jar"
   _common_jar = "$target_out_dir/cronet_impl_common_base_java.processed.jar"
-  _platform_jar = "$target_out_dir/cronet_impl_platform_base_java.processed.jar"
   _native_jar = "$target_out_dir/cronet_impl_native_base_java.processed.jar"
   args = [
     "--api_jar",
@@ -1654,8 +1605,6 @@ action("api_static_checks") {
     "--impl_jar",
     rebase_path(_common_jar, root_build_dir),
     "--impl_jar",
-    rebase_path(_platform_jar, root_build_dir),
-    "--impl_jar",
     rebase_path(_native_jar, root_build_dir),
     "--stamp",
     rebase_path(outputs[0], root_build_dir),
@@ -1664,12 +1613,10 @@ action("api_static_checks") {
     ":cronet_api_java",
     ":cronet_impl_common_base_java",
     ":cronet_impl_native_base_java",
-    ":cronet_impl_platform_base_java",
   ]
   inputs = [
     _api_jar,
     _common_jar,
-    _platform_jar,
     _native_jar,
     "//components/cronet/tools/update_api.py",
   ]
-- 
2.40.1.495.gc816e09b53d-goog