commit 93ed18854a2afd94434d15d2454c9217661ba69c
author android-build-team Robot <android-build-team-robot@google.com> Sat Oct 05 23:22:37 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Oct 05 23:22:37 2019 +0000
tree 191bc4a101309b4bb97b8afe3d436e14c3457c45
parent b9c79460f7b94f7ec96a899cb60f46e44b78cce4
parent 2e771a25d8437246287c87d8045794c7f6968ec1

Snap for 5922838 from 2e771a25d8437246287c87d8045794c7f6968ec1 to rvc-release

Change-Id: I15afc2495e58075a2c5cc0b9d21a98fa5ea08a61

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