Merge "Fix compilation when targeting OpenJDK 9." am: 0d2f465ed7 am: e03a757d87

am: 084d8365b2

Change-Id: I628c836ce87bde417f7cba64cf4bb20e206bc835

1 files changed, 10 insertions, 0 deletions

diff --git a/tools/processors/unsupportedappusage/Android.bp b/tools/processors/unsupportedappusage/Android.bp
index 98f3c955a2d2..1aca3edfab88 100644
--- a/tools/processors/unsupportedappusage/Android.bp
+++ b/tools/processors/unsupportedappusage/Android.bp
@@ -11,5 +11,15 @@ java_library_host {
         "guava",
         "unsupportedappusage-annotation"
     ],
+    openjdk9: {
+        javacflags: [
+            "--add-modules=jdk.compiler",
+            "--add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+            "--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
+            "--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+            "--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+        ],
+    },
+
     use_tools_jar: true,
 }