From f89bf9390017310f452c1d39c5da044e3b27462e Mon Sep 17 00:00:00 2001
From: jahinimtiaz <jahinimtiaz@google.com>
Date: Thu, 6 Apr 2023 20:17:18 +0000
Subject: Include module dependencies under `data`

Bug: 269138674
Bug: 279960392
Test: mts-traded run mts -m net_unittests_tester -a x86 && generated coverage
Change-Id: I05dc0f01506b8330a4e06e0a41cb487e434b9373
---
 Android.extras.bp      |  6 +-----
 test_runner/Android.bp | 10 ++++------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Android.extras.bp b/Android.extras.bp
index 5fe86ae3f..4b173352e 100644
--- a/Android.extras.bp
+++ b/Android.extras.bp
@@ -144,10 +144,6 @@ java_defaults {
         "androidx.annotation_annotation",
         "junit",
     ],
-    test_suites: [
-        "general-tests",
-        "mts-tethering",
-    ],
 }
 
 filegroup {
@@ -252,7 +248,7 @@ android_test_helper_app {
     static_libs: ["cronet_for_testing_net_java"],
     resource_dirs : [
         "net/android/unittest_support/res",
-    ]
+    ],
 }
 
 // ------------------------------ JAVA TEST TARGETS --------------------------------------------
diff --git a/test_runner/Android.bp b/test_runner/Android.bp
index 8bba94abc..ed1f6f387 100644
--- a/test_runner/Android.bp
+++ b/test_runner/Android.bp
@@ -30,10 +30,8 @@ java_test_host {
         "tradefed",
         "framework-annotations-lib",
     ],
-    required: [
-        "cronet_net_tester_app",
-    ],
     data: [
+        ":cronet_net_tester_app",
         ":net_unittests_data",
     ],
     test_suites: [
@@ -59,9 +57,6 @@ java_test_host {
         "tradefed",
         "framework-annotations-lib",
     ],
-    required: [
-        "cronet_tester_app",
-    ],
     test_suites: [
         "general-tests",
         "mts-tethering",
@@ -74,4 +69,7 @@ java_test_host {
             enabled: false,
         },
     },
+    data: [
+        ":cronet_tester_app",
+    ],
 }
-- 
cgit v1.2.3