152 lines
5.1 KiB
Diff
152 lines
5.1 KiB
Diff
From 29644724dd0a671de9c6028d35b87b4cc7f8177d Mon Sep 17 00:00:00 2001
|
|
From: Dan Stahr <danstahr@google.com>
|
|
Date: Tue, 10 Jan 2023 10:31:27 +0000
|
|
Subject: [PATCH] Remove fake Cronet classes.
|
|
|
|
Test: m
|
|
|
|
Change-Id: I6a2641acd3ee9d09b72ed24ec2479364542a034e
|
|
---
|
|
components/cronet/android/BUILD.gn | 69 ------------------------------
|
|
1 file changed, 69 deletions(-)
|
|
|
|
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
|
|
index 294b350f5e12f..6fd694ec4bf66 100644
|
|
--- a/components/cronet/android/BUILD.gn
|
|
+++ b/components/cronet/android/BUILD.gn
|
|
@@ -331,27 +331,6 @@ android_library("cronet_impl_common_base_java") {
|
|
srcjar_deps = cronet_impl_common_java_srcjar_deps
|
|
}
|
|
|
|
-# cronet_impl_fake_base_java.jar - Fake implementation of Cronet.
|
|
-android_library("cronet_impl_fake_base_java") {
|
|
- sources = [
|
|
- "fake/java/org/chromium/net/test/FakeCronetController.java",
|
|
- "fake/java/org/chromium/net/test/FakeCronetEngine.java",
|
|
- "fake/java/org/chromium/net/test/FakeCronetProvider.java",
|
|
- "fake/java/org/chromium/net/test/FakeRequestFinishedInfo.java",
|
|
- "fake/java/org/chromium/net/test/FakeUrlRequest.java",
|
|
- "fake/java/org/chromium/net/test/FakeUrlResponse.java",
|
|
- "fake/java/org/chromium/net/test/ResponseMatcher.java",
|
|
- "fake/java/org/chromium/net/test/UrlResponseMatcher.java",
|
|
- ]
|
|
-
|
|
- deps = [
|
|
- ":cronet_api_java",
|
|
- ":cronet_impl_common_base_java",
|
|
- ":cronet_impl_java_util_java",
|
|
- "//third_party/androidx:androidx_annotation_annotation_java",
|
|
- ]
|
|
-}
|
|
-
|
|
android_library("cronet_urlconnection_impl_java") {
|
|
sources = [
|
|
"java/src/org/chromium/net/urlconnection/CronetBufferedOutputStream.java",
|
|
@@ -567,15 +546,6 @@ android_java_prebuilt("package_impl_platform_java") {
|
|
]
|
|
}
|
|
|
|
-android_java_prebuilt("package_impl_fake_java") {
|
|
- jar_path = "$_package_dir/cronet_impl_fake_java.jar"
|
|
- deps = [
|
|
- ":package_api_java",
|
|
- ":package_impl_common_java",
|
|
- ":repackage_fake",
|
|
- ]
|
|
-}
|
|
-
|
|
template("jar_src") {
|
|
action_with_pydeps(target_name) {
|
|
_rebased_src_search_dirs =
|
|
@@ -665,12 +635,6 @@ jar_src("jar_cronet_impl_common_java_source") {
|
|
jar_path = "$_package_dir/cronet_impl_common_java-src.jar"
|
|
}
|
|
|
|
-jar_src("jar_cronet_impl_fake_java_source") {
|
|
- src_search_dirs = [ "fake/java" ]
|
|
- source_deps = [ ":cronet_impl_fake_base_java" ]
|
|
- jar_path = "$_package_dir/cronet_impl_fake_java-src.jar"
|
|
-}
|
|
-
|
|
jar_src("jar_cronet_impl_util_java_source") {
|
|
src_search_dirs = [ "java/src" ]
|
|
source_deps = [ ":cronet_impl_java_util_java" ]
|
|
@@ -720,11 +684,6 @@ repackage_jars("repackage_api") {
|
|
deps = [ ":cronet_api_java" ]
|
|
}
|
|
|
|
-repackage_jars("repackage_fake") {
|
|
- output = "$_package_dir/cronet_impl_fake_java.jar"
|
|
- deps = [ ":cronet_impl_fake_base_java" ]
|
|
-}
|
|
-
|
|
repackage_jars("repackage_util") {
|
|
output = "$_package_dir/cronet_impl_util_java.jar"
|
|
deps = [ ":cronet_impl_java_util_java" ]
|
|
@@ -959,32 +918,8 @@ android_library("cronet_common_javatests") {
|
|
] + cronet_tests_androidx_common_srcs
|
|
}
|
|
|
|
-# cronet_fake_javatests.jar - Java tests for the fake implementation of Cronet.
|
|
-android_library("cronet_fake_javatests") {
|
|
- testonly = true
|
|
- sources = [
|
|
- "fake/javatests/org/chromium/net/test/FakeCronetControllerTest.java",
|
|
- "fake/javatests/org/chromium/net/test/FakeCronetEngineTest.java",
|
|
- "fake/javatests/org/chromium/net/test/FakeCronetProviderTest.java",
|
|
- "fake/javatests/org/chromium/net/test/FakeUrlRequestTest.java",
|
|
- "fake/javatests/org/chromium/net/test/FakeUrlResponseTest.java",
|
|
- "fake/javatests/org/chromium/net/test/UrlResponseMatcherTest.java",
|
|
- ]
|
|
-
|
|
- deps = [
|
|
- ":cronet_api_java",
|
|
- ":cronet_common_javatests",
|
|
- ":cronet_impl_common_base_java",
|
|
- ":cronet_impl_fake_base_java",
|
|
- "//base:base_java_test_support",
|
|
- "//third_party/android_sdk:android_test_base_java",
|
|
- "//third_party/junit",
|
|
- ] + cronet_tests_androidx_common_srcs
|
|
-}
|
|
-
|
|
cronet_javatests_deps_to_package = [
|
|
":cronet_common_javatests",
|
|
- ":cronet_fake_javatests",
|
|
":cronet_test_apk_java",
|
|
"//base:base_java",
|
|
"//base:jni_java",
|
|
@@ -1473,7 +1408,6 @@ copy("cronet_package_copy") {
|
|
"//AUTHORS",
|
|
"//chrome/VERSION",
|
|
"cronet_impl_common_proguard.cfg",
|
|
- "cronet_impl_fake_proguard.cfg",
|
|
"cronet_impl_platform_proguard.cfg",
|
|
"implementation_api_version.txt",
|
|
"interface_api_version.txt",
|
|
@@ -1484,7 +1418,6 @@ copy("cronet_package_copy") {
|
|
":cronet_api_java",
|
|
":cronet_combine_proguard_flags",
|
|
":cronet_impl_common_base_java",
|
|
- ":cronet_impl_fake_base_java",
|
|
]
|
|
}
|
|
|
|
@@ -1672,13 +1605,11 @@ group("cronet_package_android") {
|
|
":generate_licenses",
|
|
":jar_cronet_api_source",
|
|
":jar_cronet_impl_common_java_source",
|
|
- ":jar_cronet_impl_fake_java_source",
|
|
":jar_cronet_impl_native_java_source",
|
|
":jar_cronet_impl_platform_java_source",
|
|
":jar_cronet_sample_source",
|
|
":repackage_api",
|
|
":repackage_common",
|
|
- ":repackage_fake",
|
|
":repackage_native",
|
|
":repackage_platform",
|
|
]
|
|
--
|
|
2.41.0.rc0.172.g3f132b7071-goog
|
|
|