summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Desprez <jdesprez@google.com>2021-02-24 18:25:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-24 18:25:25 +0000
commit2867a201c365e125eeead15d04a2e535dcab7214 (patch)
tree6a756bbcef7dbcaa230d667243730e9957b56dc0
parent9d47d54accfbef1001da5c082e85f410c9128066 (diff)
parentb7dc8c85ce8c05cc9c47bc8fb7f25ce795480453 (diff)
downloaddalvik-2867a201c365e125eeead15d04a2e535dcab7214.tar.gz
Merge "Attempt to fix dx-tests to run in CI as a unit tests" am: 27d7b79d6d am: 808547956e am: fadc7b0701 am: b7dc8c85ce
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1601095 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib515ba88331e11cc3e99c9b55c43958cf40fa898
-rw-r--r--dx/junit-tests/Android.bp9
1 files changed, 8 insertions, 1 deletions
diff --git a/dx/junit-tests/Android.bp b/dx/junit-tests/Android.bp
index c508430b3..1fcc792c1 100644
--- a/dx/junit-tests/Android.bp
+++ b/dx/junit-tests/Android.bp
@@ -12,8 +12,15 @@ package {
java_test_host {
name: "dx-tests",
srcs: ["**/*.java"],
- libs: [
+ // Avoid anything depending on this target
+ visibility: ["//visibility:private"],
+ static_libs: [
"dx",
+ ],
+ libs: [
"junit-host",
],
+ test_options: {
+ unit_test: true,
+ },
}