commit 49a4e329dc9f659f30a4eb4893d3610c7362afbb
author jingwen <jingwen@google.com> Fri Aug 24 16:00:33 2018 -0700
committer Laurent Le Brun <laurentlb@gmail.com> Thu Sep 20 17:58:18 2018 +0200
tree b4da021e89eb73b61d6eb9f4c9668a768916f6e0
parent fe289d9ea521dff36e33028fe6753622d2fbb8b8

Ignore unrecognized VM options in desugar.sh, such as the JVM 9 flags to silence warnings.

This prevents stopping the build when invoking desugar with JDK 8.

RELNOTES: None.
PiperOrigin-RevId: 210172285

tools/android/desugar.sh

diff --git a/tools/android/desugar.sh b/tools/android/desugar.sh
index 1c98306..2f34e77 100644
--- a/tools/android/desugar.sh
+++ b/tools/android/desugar.sh
@@ -122,6 +122,7 @@
       done
 
       "${DESUGAR}" \
+          "--jvm_flag=-XX:+IgnoreUnrecognizedVMOptions" \
           "--jvm_flags=--add-opens=java.base/java.lang.invoke=ALL-UNNAMED" \
           "--jvm_flags=--add-opens=java.base/java.nio=ALL-UNNAMED" \
           "--jvm_flags=--add-opens=java.base/java.lang=ALL-UNNAMED" \
@@ -134,6 +135,7 @@
 fi
 
 "${DESUGAR}" \
+    "--jvm_flag=-XX:+IgnoreUnrecognizedVMOptions" \
     "--jvm_flags=--add-opens=java.base/java.lang.invoke=ALL-UNNAMED" \
     "--jvm_flags=--add-opens=java.base/java.nio=ALL-UNNAMED" \
     "--jvm_flags=--add-opens=java.base/java.lang=ALL-UNNAMED" \