diff options
| author | 2019-08-05 14:43:25 -0700 | |
|---|---|---|
| committer | 2019-08-05 14:43:25 -0700 | |
| commit | a88f18a5c70640d0b8ade03530f06ad6538ae09a (patch) | |
| tree | 70b1a5c35b8ab38e1940c742e906c83ef20c4b2f | |
| parent | fde134f106c69cf43b63fbe8c6578197a3e246bb (diff) | |
| parent | 2f62154908b44119480b4b34214edf98eef6e390 (diff) | |
Merge "Fix dependency on APK used by test" am: 85d2ac2e12 am: 6bbd7c4cc6
am: 2f62154908
Change-Id: I0bfeac966366c6c6eace47b79470f2e0e798adc6
| -rw-r--r-- | core/tests/coretests/Android.bp | 2 | ||||
| -rw-r--r-- | core/tests/coretests/BstatsTestApp/Android.bp | 4 | ||||
| -rw-r--r-- | services/tests/servicestests/Android.bp | 2 | ||||
| -rw-r--r-- | services/tests/servicestests/test-apps/JobTestApp/Android.bp | 2 | ||||
| -rw-r--r-- | tools/preload-check/Android.bp | 1 | ||||
| -rw-r--r-- | tools/preload-check/device/Android.bp | 1 |
6 files changed, 5 insertions, 7 deletions
diff --git a/core/tests/coretests/Android.bp b/core/tests/coretests/Android.bp index 833c7347926b..1670d49a46c4 100644 --- a/core/tests/coretests/Android.bp +++ b/core/tests/coretests/Android.bp @@ -58,6 +58,8 @@ android_test { resource_dirs: ["res"], resource_zips: [":FrameworksCoreTests_apks_as_resources"], + + data: [":BstatsTestApp"], } // Rules to copy all the test apks to the intermediate raw resource directory diff --git a/core/tests/coretests/BstatsTestApp/Android.bp b/core/tests/coretests/BstatsTestApp/Android.bp index 424c71a4d8d0..a89d72830686 100644 --- a/core/tests/coretests/BstatsTestApp/Android.bp +++ b/core/tests/coretests/BstatsTestApp/Android.bp @@ -15,10 +15,6 @@ android_test_helper_app { name: "BstatsTestApp", - test_suites: [ - "device-tests", - ], - static_libs: ["coretests-aidl"], srcs: ["**/*.java"], diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index 0614b3a40cb2..ecddeb3dda61 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -82,6 +82,8 @@ android_test { optimize: { enabled: false, }, + + data: [":JobTestApp"], } java_library { diff --git a/services/tests/servicestests/test-apps/JobTestApp/Android.bp b/services/tests/servicestests/test-apps/JobTestApp/Android.bp index ae1eca7ba707..b29e187576c3 100644 --- a/services/tests/servicestests/test-apps/JobTestApp/Android.bp +++ b/services/tests/servicestests/test-apps/JobTestApp/Android.bp @@ -17,8 +17,6 @@ android_test_helper_app { sdk_version: "current", - test_suites: ["device-tests"], - srcs: ["**/*.java"], dex_preopt: { diff --git a/tools/preload-check/Android.bp b/tools/preload-check/Android.bp index 2488341bfd97..87b31d22af32 100644 --- a/tools/preload-check/Android.bp +++ b/tools/preload-check/Android.bp @@ -19,4 +19,5 @@ java_test_host { libs: ["tradefed"], test_suites: ["general-tests"], required: ["preload-check-device"], + data: [":preload-check-device"], } diff --git a/tools/preload-check/device/Android.bp b/tools/preload-check/device/Android.bp index 7782b0d378ae..f40d8ba5a287 100644 --- a/tools/preload-check/device/Android.bp +++ b/tools/preload-check/device/Android.bp @@ -20,7 +20,6 @@ java_test_helper_library { sdk_version: "current", srcs: ["src/**/*.java"], - test_suites: ["general-tests"], dex_preopt: { enabled: false, }, |