commit 92f8b03023615d096e4fdb60dca5cba8480132b6
author android-build-prod (mdb) <android-build-team-robot@google.com> Thu Oct 01 20:30:03 2020 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> Thu Oct 01 20:30:03 2020 +0000
tree 4ee6060f9b6d3b9c0b18d885891a1053ed019dcb
parent c467be2c6746abcf1f3c083934b3901c66b09579
parent 0d2651b058cb7fb2834ba6dee4f1e218a57774ae

Snap for 6877830 from 0d2651b058cb7fb2834ba6dee4f1e218a57774ae to sdk-release

Change-Id: Ie809a25c07d31a8e0336c051e5927b8ecf1ddf60

Android.bp

diff --git a/Android.bp b/Android.bp
index b0e24e5..34d70c3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,6 +21,11 @@
     srcs: ["src/main/java/**/*.java"],
     sdk_version: "core_current",
     static_libs: ["hamcrest"],
+
+    // Pin to Java language level 8. It is loaded by an OpenJDK 8 runtime from
+    // prebuilts/studio/jdk in frameworks/layoutlib/bridge/tests/run_tests.sh.
+    // See b/141970724.
+    java_version: "1.8",
 }
 
 // Legacy junit-host jar until references are updated