Snap for 5922838 from 2e771a25d8437246287c87d8045794c7f6968ec1 to rvc-release
Change-Id: I15afc2495e58075a2c5cc0b9d21a98fa5ea08a61
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