commit 24f9983c0cba7033df9e6addae74238db085b28e
author Pete Gillin <peteg@google.com> Tue Aug 27 11:13:17 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 27 11:13:17 2019 -0700
tree 331ad8850038346a2ab3729efe22d841541e0426
parent 98eba878d9d1c58e53bfc96814e7360a251a46d9
parent 7b2e0b0f3c30af3310fbaa6c1ff0403b03577ee0

Pin the dokka java_binary_host module to Java language level 8.
am: 7b2e0b0f3c

Change-Id: I4ca327f3ae12581aff34ab447d9341ea415b15a3

Android.bp

diff --git a/Android.bp b/Android.bp
index 7dfc051..f67ea23 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,6 +23,10 @@
     static_libs: [
       "dokka-tools-common-m2-deps",
     ],
+    // Pin to Java 8 since dokka doesn't compile with the Java 9 module system
+    // (it references packages under com.sun.tools.doclets which are not
+    // exported from the jdk.javadoc module) (see b/140097603):
+    java_version: "1.8",
     kotlincflags: ["-language-version 1.2 -api-version 1.2 -jvm-target 1.8"],
     use_tools_jar: true,
     java_resource_dirs: ["core/src/main/resources"],