Merge "Include module dependencies under data" am: 932fe8ac1d am: 042455c19f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2486137

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

apct-tests/perftests/multiuser/Android.bp

@@ -31,6 +31,9 @@ android_test {
     ],
     platform_apis: true,
     test_suites: ["device-tests"],
-    data: ["trace_configs/*"],
+    data: [
+        ":MultiUserPerfDummyApp",
+        "trace_configs/*",
+    ],
     certificate: "platform",
 }

apct-tests/perftests/packagemanager/Android.bp

@@ -33,7 +33,10 @@ android_test {
 
     test_suites: ["device-tests"],
 
-    data: [":perfetto_artifacts"],
+    data: [
+        ":QueriesAll0",
+        ":perfetto_artifacts",
+    ],
 
     certificate: "platform",
 

libs/hwui/Android.bp

@@ -722,6 +722,9 @@ cc_test {
         "tests/unit/VectorDrawableTests.cpp",
         "tests/unit/WebViewFunctorManagerTests.cpp",
     ],
+    data: [
+        ":hwuimicro",
+    ],
 }
 
 // ------------------------

native/android/tests/activitymanager/nativeTests/Android.bp

@@ -45,4 +45,7 @@ cc_test {
     required: [
         "UidImportanceHelperApp",
     ],
+    data: [
+        ":UidImportanceHelperApp",
+    ],
 }

tests/FlickerTests/Android.bp

@@ -47,6 +47,9 @@ android_test {
         "launcher-aosp-tapl",
         "platform-test-annotations",
     ],
+    data: [
+        ":FlickerTestApp",
+    ],
 }
 
 java_library {

tests/OdmApps/Android.bp

@@ -26,4 +26,7 @@ java_test_host {
     srcs: ["src/**/*.java"],
     libs: ["tradefed"],
     test_suites: ["device-tests"],
+    data: [
+        ":TestOdmApp",
+    ],
 }

tests/StagedInstallTest/Android.bp

@@ -55,6 +55,7 @@ java_test_host {
         "cts-install-lib-host",
     ],
     data: [
+        ":StagedInstallInternalTestApp",
         ":apex.apexd_test",
         ":com.android.apex.apkrollback.test_v1",
         ":StagedInstallTestApexV2",

tests/SystemMemoryTest/host/Android.bp

@@ -26,4 +26,7 @@ java_test_host {
     srcs: ["src/**/*.java"],
     libs: ["tradefed"],
     test_suites: ["general-tests"],
+    data: [
+        ":SystemMemoryTestDevice",
+    ],
 }