commit ed6249f672b24ea3034ec2d778fbc35b1f655091
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Sun Nov 10 11:05:14 2019 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Sun Nov 10 11:05:14 2019 +0000
tree 1c7e60492be7effe9aedf3bbbf7c4e9c2c03033f
parent 2513c2f3faf68bac891b5ba2204f06ac43679e4e
parent 6c5e9fd80df01abb35281d4048dd0f1e53b75e31

Snap for 5999261 from 6c5e9fd80df01abb35281d4048dd0f1e53b75e31 to r-keystone-qcom-release

Change-Id: I68a68f8a92af628d9c85c6f1740a33e57e203cfb

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