Merge d4c66d5e25c92d2461ec064f6ea99e8cff100a9d on remote branch
Change-Id: I57f3afaa876da27fcb5688d213a02feed0f1a09d
diff --git a/Android.bp b/Android.bp
index 7573ab7..57771c5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -81,7 +81,6 @@
"jsr330",
],
- java_version: "1.8",
sdk_version: "core_current",
}
@@ -105,7 +104,6 @@
"jsr330",
],
- java_version: "1.8",
sdk_version: "core_current",
}
@@ -178,7 +176,17 @@
include_dirs: ["external/protobuf/src/"],
},
- java_version: "1.8",
+ // From Java 9 onward com.sun.tools.javac is not visible by default
+ javacflags: [
+ "--add-modules=jdk.compiler",
+ "--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+ "--add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+ "--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+ "--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
+ "--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
+ "--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+ "--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+ ],
}
// Compile dummy implementations of annotations used by dagger2 but not