commit 808547956e8ce61ee123d9b3197f6e9f46c0bfb9
author Julien Desprez <jdesprez@google.com> Wed Feb 24 16:39:36 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 24 16:39:36 2021 +0000
tree 6a756bbcef7dbcaa230d667243730e9957b56dc0
parent 45bba9ec661a22260b928721b0fdfc664ceb37bc
parent 27d7b79d6d6063a42dda5a73caa6d59b71304b64

Merge "Attempt to fix dx-tests to run in CI as a unit tests" am: 27d7b79d6d

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1601095

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95974304d07396b11ebb00a9511f5389cc3ff810

dx/junit-tests/Android.bp

diff --git a/dx/junit-tests/Android.bp b/dx/junit-tests/Android.bp
index c508430..1fcc792 100644
--- a/dx/junit-tests/Android.bp
+++ b/dx/junit-tests/Android.bp
@@ -12,8 +12,15 @@
 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,
+    },
 }