Move AOSP only classes to the android.net.http package am: d21f52c2ad

Original change: https://android-review.googlesource.com/c/platform/external/cronet/+/2633282

Change-Id: I25e199dcfa965803eb3efad89715fa763f49ed8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

10 files changed, 102 insertions, 88 deletions

diff --git a/Android.bp b/Android.bp
index 058320260..b206b68ae 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13701,7 +13701,7 @@ java_library {
     ],
     visibility: [
         "//packages/modules/Connectivity:__subpackages__",
-        "//external/cronet/android:__subpackages__",
+        "//external/cronet:__subpackages__",
     ],
 }
 
diff --git a/Android.extras.bp b/Android.extras.bp
index cacf7c52d..5fe86ae3f 100644
--- a/Android.extras.bp
+++ b/Android.extras.bp
@@ -346,15 +346,6 @@ genrule {
     ],
 }
 
-filegroup {
-   name: "cronet_logger_tests_sources",
-   srcs: [
-        "logging/SizeBucketsTest.java",
-        "logging/RateLimiterTest.java",
-        "logging/ExperimentalOptionsTest.java",
-    ],
-}
-
 android_library {
     name: "cronet_java_tests",
     defaults: ["jni_proxy_natives_defaults"],
@@ -400,3 +391,102 @@ android_library {
     ],
 }
 
+// ------------------------------ TELEMETRY TARGETS --------------------------------------------
+
+genrule {
+  name: "statslog-cronet-java-gen",
+  tools: ["stats-log-api-gen"],
+  cmd: "$(location stats-log-api-gen) --java $(out) --module cronet --javaPackage android.net.http --javaClass CronetStatsLog",
+  out: ["android/net/http/CronetStatsLog.java"],
+}
+
+java_library {
+    name: "cronetstatslog_autogenerated_methods",
+    srcs: [
+        ":statslog-cronet-java-gen",
+    ],
+    libs: [
+        "framework-statsd",
+    ],
+    sdk_version: "module_current",
+    min_sdk_version: "30",
+    apex_available: [
+        "com.android.tethering",
+    ],
+}
+
+java_library {
+    name: "cronet_experimental_options",
+    srcs: [
+        "android/java/src/android/net/http/ExperimentalOptions.java",
+    ],
+    libs: [
+        "cronetstatslog_autogenerated_methods",
+    ],
+    sdk_version: "module_current",
+    min_sdk_version: "30",
+    apex_available: [
+        "com.android.tethering",
+    ],
+}
+
+java_library {
+    name: "cronet_rate_limiter",
+    srcs: [
+        "android/java/src/android/net/http/RateLimiter.java",
+    ],
+    sdk_version: "module_current",
+    min_sdk_version: "30",
+    apex_available: [
+        "com.android.tethering",
+    ],
+}
+
+java_library {
+    name: "cronet_size_buckets",
+    srcs: [
+        "android/java/src/android/net/http/SizeBuckets.java",
+    ],
+    libs: [
+        "cronetstatslog_autogenerated_methods",
+    ],
+    sdk_version: "module_current",
+    min_sdk_version: "30",
+    apex_available: [
+        "com.android.tethering",
+    ],
+}
+
+java_library {
+    name: "http_client_logging",
+    srcs: [
+        "android/java/src/android/net/http/CronetLoggerImpl.java",
+    ],
+    static_libs: [
+        "cronetstatslog_autogenerated_methods",
+        "cronet_experimental_options",
+        "cronet_rate_limiter",
+        "cronet_size_buckets",
+    ],
+    libs: [
+        "androidx.annotation_annotation",
+        "cronet_aml_java",
+    ],
+    sdk_version: "module_current",
+    min_sdk_version: "30",
+    apex_available: [
+        "com.android.tethering",
+    ],
+    visibility: [
+        "//packages/modules/Connectivity:__subpackages__",
+    ],
+}
+
+filegroup {
+   name: "cronet_logger_tests_sources",
+   srcs: [
+        "android/javatests/src/android/net/http/SizeBucketsTest.java",
+        "android/javatests/src/android/net/http/RateLimiterTest.java",
+        "android/javatests/src/android/net/http/ExperimentalOptionsTest.java",
+    ],
+}
diff --git a/logging/CronetLoggerImpl.java b/android/java/src/android/net/http/CronetLoggerImpl.java
index 26421fb63..26421fb63 100644
--- a/logging/CronetLoggerImpl.java
+++ b/android/java/src/android/net/http/CronetLoggerImpl.java
diff --git a/logging/ExperimentalOptions.java b/android/java/src/android/net/http/ExperimentalOptions.java
index 5e37ca4bc..b467dd449 100644
--- a/logging/ExperimentalOptions.java
+++ b/android/java/src/android/net/http/ExperimentalOptions.java
@@ -268,7 +268,7 @@ public final class ExperimentalOptions {
   }
 
   // Source: //external/cronet:net/third_party/quiche/src/quiche/quic/core/crypto/crypto_protocol.h
-  static final Set<String> validConnectionOptions =
+  public static final Set<String> validConnectionOptions =
       Set.of(
           "CHLO", "SHLO", "SCFG", "REJ", "CETV", "PRST", "SCUP", "ALPN", "P256", "C255", "AESG",
           "CC20", "QBIC", "AFCW", "IFW5", "IFW6", "IFW7", "IFW8", "IFW9", "IFWA", "TBBR", "1RTT",
diff --git a/logging/RateLimiter.java b/android/java/src/android/net/http/RateLimiter.java
index f4e412b6c..f4e412b6c 100644
--- a/logging/RateLimiter.java
+++ b/android/java/src/android/net/http/RateLimiter.java
diff --git a/logging/SizeBuckets.java b/android/java/src/android/net/http/SizeBuckets.java
index 00580a9de..00580a9de 100644
--- a/logging/SizeBuckets.java
+++ b/android/java/src/android/net/http/SizeBuckets.java
diff --git a/logging/ExperimentalOptionsTest.java b/android/javatests/src/android/net/http/ExperimentalOptionsTest.java
index 137f0179e..137f0179e 100644
--- a/logging/ExperimentalOptionsTest.java
+++ b/android/javatests/src/android/net/http/ExperimentalOptionsTest.java
diff --git a/logging/RateLimiterTest.java b/android/javatests/src/android/net/http/RateLimiterTest.java
index b3fc29f78..8e05662ed 100644
--- a/logging/RateLimiterTest.java
+++ b/android/javatests/src/android/net/http/RateLimiterTest.java
@@ -44,3 +44,4 @@ public final class RateLimiterTest {
         () -> new RateLimiter(samplesPerSecond));
   }
 }
+
diff --git a/logging/SizeBucketsTest.java b/android/javatests/src/android/net/http/SizeBucketsTest.java
index 0f309fa3b..0f309fa3b 100644
--- a/logging/SizeBucketsTest.java
+++ b/android/javatests/src/android/net/http/SizeBucketsTest.java
diff --git a/logging/Android.bp b/logging/Android.bp
deleted file mode 100644
index b4e223982..000000000
--- a/logging/Android.bp
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (C) 2023 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-genrule {
-  name: "statslog-cronet-java-gen",
-  tools: ["stats-log-api-gen"],
-  cmd: "$(location stats-log-api-gen) --java $(out) --module cronet --javaPackage android.net.http --javaClass CronetStatsLog",
-  out: ["android/net/http/CronetStatsLog.java"],
-}
-
-java_library {
-    name: "cronetstatslog_autogenerated_methods",
-    srcs: [
-        ":statslog-cronet-java-gen",
-    ],
-    libs: [
-        "framework-statsd",
-    ],
-    sdk_version: "module_current",
-    min_sdk_version: "30",
-    apex_available: [
-        "com.android.tethering",
-    ],
-}
-
-java_library {
-    name: "cronet_experimental_options",
-    srcs: [
-        "ExperimentalOptions.java",
-    ],
-    libs: [
-        "cronetstatslog_autogenerated_methods",
-    ],
-    sdk_version: "module_current",
-    min_sdk_version: "30",
-    apex_available: [
-        "com.android.tethering",
-    ],
-}
-
-java_library {
-    name: "cronet_rate_limiter",
-    srcs: [
-        "RateLimiter.java",
-    ],
-    sdk_version: "module_current",
-    min_sdk_version: "30",
-    apex_available: [
-        "com.android.tethering",
-    ],
-}
-
-java_library {
-    name: "cronet_size_buckets",
-    srcs: [
-        "SizeBuckets.java",
-    ],
-    libs: [
-        "cronetstatslog_autogenerated_methods",
-    ],
-    sdk_version: "module_current",
-    min_sdk_version: "30",
-    apex_available: [
-        "com.android.tethering",
-    ],
-}