Adding missing dependencies of CTS modules batch 7
Bug: 226950040
Test: Presubmit
Change-Id: If78cad2920f1ccd3bcde2c7e7f4028bf56505d0e
diff --git a/tests/tests/openglperf/Android.bp b/tests/tests/openglperf/Android.bp
index da7eaa7..c298873 100644
--- a/tests/tests/openglperf/Android.bp
+++ b/tests/tests/openglperf/Android.bp
@@ -41,4 +41,8 @@
         "cts",
         "general-tests",
     ],
+    data: [
+        ":com.replica.replicaisland",
+    ],
+    per_testcase_directory: true,
 }
diff --git a/tests/tests/os/Android.bp b/tests/tests/os/Android.bp
index a8116ac..8bc8222 100644
--- a/tests/tests/os/Android.bp
+++ b/tests/tests/os/Android.bp
@@ -74,4 +74,11 @@
     // Do not compress minijail policy files.
     aaptflags: ["-0 .policy"],
     min_sdk_version: "29",
+    data: [
+        ":CtsAutoRevokeQApp",
+        ":CtsAutoRevokeSApp",
+        ":CtsAutoRevokeRApp",
+        ":CtsCompanionTestApp",
+    ],
+    per_testcase_directory: true,
 }
diff --git a/tests/tests/packageinstaller/adminpackageinstaller/Android.bp b/tests/tests/packageinstaller/adminpackageinstaller/Android.bp
index 62a44fc..f829a93 100644
--- a/tests/tests/packageinstaller/adminpackageinstaller/Android.bp
+++ b/tests/tests/packageinstaller/adminpackageinstaller/Android.bp
@@ -34,4 +34,8 @@
         "cts",
         "general-tests",
     ],
+    data: [
+        ":CtsEmptyTestApp",
+    ],
+    per_testcase_directory: true,
 }
diff --git a/tests/tests/packageinstaller/install/Android.bp b/tests/tests/packageinstaller/install/Android.bp
index 8444e02..3d3e21a 100644
--- a/tests/tests/packageinstaller/install/Android.bp
+++ b/tests/tests/packageinstaller/install/Android.bp
@@ -40,4 +40,8 @@
         "cts",
         "general-tests",
     ],
+    data: [
+        ":CtsEmptyTestApp",
+    ],
+    per_testcase_directory: true,
 }
diff --git a/tests/tests/packageinstaller/install_appop_default/Android.bp b/tests/tests/packageinstaller/install_appop_default/Android.bp
index 7808af1..8eb0e34 100644
--- a/tests/tests/packageinstaller/install_appop_default/Android.bp
+++ b/tests/tests/packageinstaller/install_appop_default/Android.bp
@@ -33,4 +33,8 @@
         "cts",
         "general-tests",
     ],
+    data: [
+        ":CtsEmptyTestApp",
+    ],
+    per_testcase_directory: true,
 }
diff --git a/tests/tests/packageinstaller/install_appop_denied/Android.bp b/tests/tests/packageinstaller/install_appop_denied/Android.bp
index ee76790..20e1ad4 100644
--- a/tests/tests/packageinstaller/install_appop_denied/Android.bp
+++ b/tests/tests/packageinstaller/install_appop_denied/Android.bp
@@ -34,4 +34,8 @@
         "cts",
         "general-tests",
     ],
+    data: [
+        ":CtsEmptyTestApp",
+    ],
+    per_testcase_directory: true,
 }
diff --git a/tests/tests/packageinstaller/nopermission/Android.bp b/tests/tests/packageinstaller/nopermission/Android.bp
index 24747d1..3e5d914 100644
--- a/tests/tests/packageinstaller/nopermission/Android.bp
+++ b/tests/tests/packageinstaller/nopermission/Android.bp
@@ -43,4 +43,8 @@
         "cts",
         "general-tests",
     ],
+    data: [
+        ":CtsEmptyTestApp",
+    ],
+    per_testcase_directory: true,
 }
diff --git a/tests/tests/packageinstaller/nopermission25/Android.bp b/tests/tests/packageinstaller/nopermission25/Android.bp
index 581c9b4..ab2aed3 100644
--- a/tests/tests/packageinstaller/nopermission25/Android.bp
+++ b/tests/tests/packageinstaller/nopermission25/Android.bp
@@ -28,4 +28,8 @@
         "cts",
         "general-tests",
     ],
+    data: [
+        ":CtsEmptyTestApp",
+    ],
+    per_testcase_directory: true,
 }
diff --git a/tests/tests/packageinstaller/tapjacking/Android.bp b/tests/tests/packageinstaller/tapjacking/Android.bp
index 8035d6d..59c491d 100644
--- a/tests/tests/packageinstaller/tapjacking/Android.bp
+++ b/tests/tests/packageinstaller/tapjacking/Android.bp
@@ -33,4 +33,8 @@
         "cts",
         "general-tests",
     ],
+    data: [
+        ":CtsEmptyTestApp",
+    ],
+    per_testcase_directory: true,
 }
diff --git a/tests/tests/packageinstaller/uninstall/Android.bp b/tests/tests/packageinstaller/uninstall/Android.bp
index 537dad7..8b26e33 100644
--- a/tests/tests/packageinstaller/uninstall/Android.bp
+++ b/tests/tests/packageinstaller/uninstall/Android.bp
@@ -35,4 +35,9 @@
         "general-tests",
         "sts",
     ],
+    data: [
+        ":CtsEmptyTestApp",
+        ":CtsSelfUninstallingTestApp",
+    ],
+    per_testcase_directory: true,
 }
diff --git a/tests/tests/permission4/Android.bp b/tests/tests/permission4/Android.bp
index 22b0aa2..b20f24d 100644
--- a/tests/tests/permission4/Android.bp
+++ b/tests/tests/permission4/Android.bp
@@ -39,4 +39,8 @@
         "general-tests",
         "mts-permission",
     ],
+    data: [
+        ":CtsAppThatAccessesMicAndCameraPermission",
+    ],
+    per_testcase_directory: true,
 }
diff --git a/tests/tests/print/Android.bp b/tests/tests/print/Android.bp
index 23ed10c..0af9c18 100644
--- a/tests/tests/print/Android.bp
+++ b/tests/tests/print/Android.bp
@@ -28,4 +28,8 @@
     static_libs: ["print-test-util-lib"],
     sdk_version: "test_current",
     required: ["com.android.cts.helpers.aosp"],
+    data: [
+        ":CtsExternalPrintService",
+    ],
+    per_testcase_directory: true,
 }
diff --git a/tests/tests/security/Android.bp b/tests/tests/security/Android.bp
index cf064c6..00a1e37 100644
--- a/tests/tests/security/Android.bp
+++ b/tests/tests/security/Android.bp
@@ -74,7 +74,9 @@
         "sts",
     ],
     certificate: ":security_cts_test_certificate",
+    per_testcase_directory: true,
     data: [
+        ":CtsDeviceInfo",
         ":RolePermissionOverrideTestApp",
         ":SplitBluetoothPermissionTestApp",
     ],
diff --git a/tests/tests/sensorprivacy/Android.bp b/tests/tests/sensorprivacy/Android.bp
index 608f445..8d63414 100644
--- a/tests/tests/sensorprivacy/Android.bp
+++ b/tests/tests/sensorprivacy/Android.bp
@@ -45,4 +45,9 @@
         "android.test.runner",
         "android.test.base",
     ],
+    data: [
+        ":CtsUseMicOrCameraAndOverlayForSensorPrivacy",
+        ":CtsUseMicOrCameraForSensorPrivacy",
+    ],
+    per_testcase_directory: true,
 }
diff --git a/tests/tests/sharesheet/Android.bp b/tests/tests/sharesheet/Android.bp
index 8b4b62a..dc85889 100644
--- a/tests/tests/sharesheet/Android.bp
+++ b/tests/tests/sharesheet/Android.bp
@@ -40,4 +40,10 @@
     srcs: ["src/**/*.java"],
 
     sdk_version: "test_current",
+    data: [
+        ":CtsSharesheetExcludeTester",
+        ":CtsSharesheetActivityLabelTester",
+        ":CtsSharesheetIntentFilterLabelTester",
+    ],
+    per_testcase_directory: true,
 }