commit be5b24d9f2bafae105389bff963782193d38cbe5
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Sun Nov 10 11:10:58 2019 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Sun Nov 10 11:10:58 2019 +0000
tree 191bc4a101309b4bb97b8afe3d436e14c3457c45
parent 6a39b66016e17dbdc00cfe5048b189e10522c4fb
parent 9919f842f67e4c2b73a99ade66e7eca9740ac6b2

Snap for 5999261 from 9919f842f67e4c2b73a99ade66e7eca9740ac6b2 to r-keystone-qcom-release

Change-Id: I783132f5344dedd6b4bb73ae07a17eb9f7f616a9

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