Snap for 9705326 from 072c31e50ffef067b13057918b5311cec32a5ecb to udc-releaseandroid-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-release

Change-Id: I1f7097dfe01cea169468ed5afde1cd02720a168f

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 {