aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjahinimtiaz <jahinimtiaz@google.com>2023-03-31 23:56:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-31 23:56:53 +0000
commite4c373c3e78d8cd2347af05b16ca9ea0609778f1 (patch)
tree2a580afd1f4d26e3e0d30b029e12b0b14bb75a54
parent6541c3689e7aee3d01bcc17d957a1003d0aff615 (diff)
parentbe965e6a16098c5edfe1b166ec9dc661d647be2f (diff)
downloadaidl-e4c373c3e78d8cd2347af05b16ca9ea0609778f1.tar.gz
Include module dependencies under `data` am: be965e6a16
Original change: https://android-review.googlesource.com/c/platform/system/tools/aidl/+/2516038 Change-Id: I9725fc8ab0e0adbf9dcb5eb2d705f6d806d175bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp24
1 files changed, 24 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index f47518ea..812378ae 100644
--- a/Android.bp
+++ b/Android.bp
@@ -553,6 +553,9 @@ java_test {
"tests/java/src/android/aidl/tests/NullableTests.java",
"tests/java/src/android/aidl/tests/VintfTests.java",
],
+ data: [
+ ":cts-dalvik-device-test-runner",
+ ],
}
java_test {
@@ -565,6 +568,9 @@ java_test {
srcs: [
"tests/java/src/android/aidl/service/**/*.java",
],
+ data: [
+ ":cts-dalvik-device-test-runner",
+ ],
}
filegroup {
@@ -587,6 +593,9 @@ java_test {
name: "aidl_test_java_client_sdk29",
defaults: ["aidl_test_java_sdkversion_defaults"],
min_sdk_version: "29",
+ data: [
+ ":cts-dalvik-device-test-runner",
+ ],
srcs: [
"tests/java/src/android/aidl/sdkversion/tests/*.java",
],
@@ -599,6 +608,9 @@ java_test {
srcs: [
"tests/java/src/android/aidl/sdkversion/service/*.java",
],
+ data: [
+ ":cts-dalvik-device-test-runner",
+ ],
}
java_test {
@@ -608,12 +620,18 @@ java_test {
srcs: [
"tests/java/src/android/aidl/sdkversion/tests/*.java",
],
+ data: [
+ ":cts-dalvik-device-test-runner",
+ ],
}
java_test {
name: "aidl_test_java_service_sdk1",
defaults: ["aidl_test_java_sdkversion_defaults"],
min_sdk_version: "1",
+ data: [
+ ":cts-dalvik-device-test-runner",
+ ],
srcs: [
"tests/java/src/android/aidl/sdkversion/service/*.java",
],
@@ -629,6 +647,9 @@ java_test {
"tests/java/src/android/aidl/permission/tests/*.java",
"tests/java/src/android/aidl/permission/service/*.java",
],
+ data: [
+ ":cts-dalvik-device-test-runner",
+ ],
}
java_test {
@@ -637,6 +658,9 @@ java_test {
static_libs: [
"aidl-test-interface-permission-java",
],
+ data: [
+ ":cts-dalvik-device-test-runner",
+ ],
srcs: [
"tests/java/src/android/aidl/permission/service/*.java",
],