1 files changed, 11 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 89e024a8..98a9da32 100644
--- a/Android.bp
+++ b/Android.bp
@@ -90,6 +90,14 @@ java_library {
                 "org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/JmxRegistration.java",
             ],
         },
+        host: {
+            dist: {
+                targets: [
+                    "dist_files",
+                    "apps_only",
+                ],
+            },
+        }
     },
 
     // In order to include Jacoco in core libraries, we cannot depend on
@@ -153,6 +161,9 @@ java_library_host {
             "apps_only",
         ],
     },
+
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
 }
 
 java_library_host {