From afd03947b46ba2eab97b0bd59f1531da3cdd4f9e Mon Sep 17 00:00:00 2001
From: Stefano Duo <stefanoduo@google.com>
Date: Mon, 17 Jul 2023 14:52:16 +0000
Subject: [PATCH] Revert^2 "Cronet's MTS: don't depend on platform Cronet"

1f968f68aef9614c2884886ee077a5e42fbaabae

Change-Id: I6aabb1b3f59abc1c7165a997de62ea141a615834
---
 Cronet/tests/mts/Android.bp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Cronet/tests/mts/Android.bp b/Cronet/tests/mts/Android.bp
index 4e4251cfea..63905c83b1 100644
--- a/Cronet/tests/mts/Android.bp
+++ b/Cronet/tests/mts/Android.bp
@@ -38,7 +38,11 @@ java_genrule {
 // tests need to inherit the NetHttpTests manifest.
 android_library {
     name: "NetHttpTestsLibPreJarJar",
-    static_libs: ["cronet_java_tests"],
+    static_libs: [
+        "cronet_aml_api_java",
+        "cronet_aml_java__testing",
+        "cronet_java_tests",
+    ],
     sdk_version: "module_current",
     min_sdk_version: "30",
 }
@@ -51,7 +55,8 @@ android_test {
      static_libs: ["NetHttpTestsLibPreJarJar"],
      jarjar_rules: ":net-http-test-jarjar-rules",
      jni_libs: [
-        "cronet_aml_components_cronet_android_cronet_tests__testing"
+        "cronet_aml_components_cronet_android_cronet__testing",
+        "cronet_aml_components_cronet_android_cronet_tests__testing",
      ],
      test_suites: [
          "general-tests",