commit be5cf7026697fc6232a655bef6187c63210ebeee
author Chidera Olibie <colibie@google.com> Wed Dec 14 19:42:34 2022 +0000
committer Chidera Olibie <colibie@google.com> Wed Dec 21 14:17:57 2022 +0000
tree 0f8708f3366dbfc7644db8f40deb3445da87c6ea
parent 09cb20d8a8eba2512facb31148251ebf371f2ecf

Reland "Cronet: add test server"

This reverts commit a0fdf1e70ea30b16c26f80143d8af9ed60c6b33f.

Reason for revert: Should work now after aosp/2314940
Also removes usage of the added test server

Test: atest CtsCronetTestCases
Change-Id: I1cde8ab8205c7ed12ce97ba6e9580c9b8c333053

Cronet/tests/cts/Android.bp

diff --git a/Cronet/tests/cts/Android.bp b/Cronet/tests/cts/Android.bp
index 56f3ddb..d10c68c 100644
--- a/Cronet/tests/cts/Android.bp
+++ b/Cronet/tests/cts/Android.bp
@@ -23,11 +23,15 @@
     compile_multilib: "both", // Include both the 32 and 64 bit versions
     defaults: ["cts_defaults"],
     sdk_version: "test_current",
-    srcs: ["src/**/*.java"],
+    srcs: [
+        "src/**/*.java",
+        "src/**/*.kt",
+    ],
     static_libs: [
         "androidx.test.rules",
         "androidx.core_core",
         "ctstestrunner-axt",
+        "ctstestserver",
         "junit",
     ],
     libs: [
@@ -36,6 +40,7 @@
         "android.test.mock",
         "androidx.annotation_annotation",
         "framework-cronet",
+        "org.apache.http.legacy",
     ],
 
     // Tag this as a cts test artifact