commit bf8b9b53a4bbd5a9957fedf56d3cb6b184d3cf85
author android-build-team Robot <android-build-team-robot@google.com> Sat Oct 05 23:06:06 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Oct 05 23:06:06 2019 +0000
tree 1c7e60492be7effe9aedf3bbbf7c4e9c2c03033f
parent 7f3d848624879f82a61e97930410a04afadfb588
parent 170bfdd5ca3fdbd2a3a99ce825dca3382e307bbf

Snap for 5922838 from 170bfdd5ca3fdbd2a3a99ce825dca3382e307bbf to rvc-release

Change-Id: If350648bf4f87b7ca2bdf73b1b437b771faa2b26

Android.bp

diff --git a/Android.bp b/Android.bp
index a37e050..b00600f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,6 +20,11 @@
     hostdex: true,
     srcs: ["main/src/main/java/**/*.java"],
     sdk_version: "core_current",
+
+    // 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",
 }
 
 // Compatibility library for old name of host target