commit 9919f842f67e4c2b73a99ade66e7eca9740ac6b2
author Steven Laver <lavers@google.com> Thu Oct 24 16:39:48 2019 -0700
committer Steven Laver <lavers@google.com> Thu Oct 24 16:39:48 2019 -0700
tree 191bc4a101309b4bb97b8afe3d436e14c3457c45
parent 6a39b66016e17dbdc00cfe5048b189e10522c4fb
parent 93ed18854a2afd94434d15d2454c9217661ba69c

Merge RP1A.191024.001

Change-Id: Ia71e0e001dd0cf6d80ebdf2da918b3f5814308d5

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