Support both java8 and java9.

Change-Id: Icc47e634a01b73acec827a354098e225915c5495

src/BUILD

@@ -159,8 +159,10 @@ py_binary(
         "//src/main/native:embedded_tools",
         "//src/main/protobuf:srcs",
         "//src/java_tools/buildjar:JavaBuilderDeploy",
+        "//src/java_tools/buildjar:JavaBuilderNoJavacDeploy",
         "//src/java_tools/buildjar:VanillaJavaBuilder_deploy.jar",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar",
+        "//src/java_tools/buildjar:dummy",
         "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner_deploy.jar",
         "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:ExperimentalRunner_deploy.jar",
         "//src/java_tools/junitrunner/java/com/google/testing/coverage:embedded_tools",

src/create_embedded_tools.py

@@ -31,6 +31,7 @@
     ('*tools/jdk/BUILD*', lambda x: 'tools/jdk/BUILD'),
     ('*tools/platforms/platforms.BUILD', lambda x: 'platforms/BUILD'),
     ('*tools/platforms/*', lambda x: 'platforms/' + os.path.basename(x)),
+    ('*dummy.jar', lambda x: 'tools/jdk/' + os.path.basename(x)),
     ('*JavaBuilder*_deploy.jar', lambda x: 'tools/jdk/' + os.path.basename(x)),
     ('*JacocoCoverage*_deploy.jar',
      lambda x: 'tools/jdk/JacocoCoverage_deploy.jar'),

src/java_tools/buildjar/BUILD

@@ -27,12 +27,27 @@ java_binary(
     runtime_deps = ["//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:vanilla_java_builder"],
 )
 
+java_library(
+    name = "dummy",
+)
+
 filegroup(
     name = "JavaBuilderDeploy",
     srcs = [":JavaBuilder_deploy.jar"],
     tags = ["manual"],
 )
 
+genrule(
+    name = "JavaBuilderNoJavacDeploy",
+    srcs = [":JavaBuilder_deploy.jar"],
+    outs = ["JavaBuilderNoJavac_deploy.jar"],
+    # Strip away the known classes from javac.jar.
+    cmd =
+      "cp $< $@ && chmod u+w $@ && zip $@ " +
+      "-d jdk/\* com/sun/\* > /dev/null",
+    tags = ["manual"],
+)
+
 filegroup(
     name = "bootstrap_deploy.jar",
     srcs = ["//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:bootstrap_deploy.jar"],

src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java

@@ -81,7 +81,7 @@ public final class OptionsParser {
 
   private String ruleKind;
   private String targetLabel;
-  
+
   private boolean testOnly;
 
   /**
@@ -203,6 +203,15 @@ private void processCommandlineArgs(Deque<String> argQueue) throws InvalidComman
         case "--testonly":
           testOnly = true;
           break;
+        // Java 9 new options that begins with --.
+        // Only the ones that are useful for modifying JDK internal modules are listed here.
+        // They are needed for compiling code that uses JDK internals.
+        case "--patch-module":
+        case "--add-exports":
+        case "--add-modules":
+          javacOpts.add(arg);
+          collectFlagArguments(javacOpts, argQueue, "--");
+          break;
         default:
           throw new InvalidCommandLineException("unknown option : '" + arg + "'");
       }

src/main/cpp/blaze.cc

@@ -331,6 +331,11 @@ static vector<string> GetArgumentArray() {
   globals->options->AddJVMArgumentPrefix(
       blaze_util::Dirname(blaze_util::Dirname(globals->jvm_path)), &result);
 
+  if (CheckJavaVersionIsAtLeast(globals->jvm_version, "9.0")) {
+    result.push_back("--illegal-access=warn");
+    // Suppress Java 9 illegal access warning.
+    result.push_back("--add-opens=java.base/java.nio=ALL-UNNAMED");
+  }
   result.push_back("-XX:+HeapDumpOnOutOfMemoryError");
   string heap_crash_path = globals->options->output_base;
   result.push_back("-XX:HeapDumpPath=" + blaze::PathAsJvmFlag(heap_crash_path));
@@ -561,17 +566,18 @@ static void GoToWorkspace(const WorkspaceLayout *workspace_layout) {
 }
 
 // Check the java version if a java version specification is bundled. On
-// success, returns the executable path of the java command.
+// success, outputs java executable path and the current jvm version.
 static void VerifyJavaVersionAndSetJvm() {
   string exe = globals->options->GetJvm();
 
   string version_spec_file = blaze_util::JoinPath(
       GetEmbeddedBinariesRoot(globals->options->install_base), "java.version");
-  string version_spec = "";
+  string version_spec;
+  string jvm_version;
   if (blaze_util::ReadFile(version_spec_file, &version_spec)) {
     blaze_util::StripWhitespace(&version_spec);
     // A version specification is given, get version of java.
-    string jvm_version = GetJvmVersion(exe);
+    jvm_version = GetJvmVersion(exe);
 
     // Compare that jvm_version is found and at least the one specified.
     if (jvm_version.empty()) {
@@ -588,11 +594,12 @@ static void VerifyJavaVersionAndSetJvm() {
   }
 
   globals->jvm_path = exe;
+  globals->jvm_version = jvm_version;
 }
 
 // Starts the Blaze server.
 static int StartServer(const WorkspaceLayout *workspace_layout,
-                        BlazeServerStartup **server_startup) {
+                       BlazeServerStartup **server_startup) {
   vector<string> jvm_args_vector = GetArgumentArray();
   string argument_string = GetArgumentString(jvm_args_vector);
   string server_dir =
@@ -711,8 +718,8 @@ static void SetRestartReasonIfNotSet(RestartReason restart_reason) {
 }
 
 // Starts up a new server and connects to it. Exits if it didn't work out.
-static void StartServerAndConnect(const WorkspaceLayout *workspace_layout,
-                                  BlazeServer *server) {
+static void StartServerAndConnect(
+    const WorkspaceLayout *workspace_layout, BlazeServer *server) {
   string server_dir =
       blaze_util::JoinPath(globals->options->output_base, "server");
 
@@ -1123,7 +1130,7 @@ static void CancelServer() { blaze_server->Cancel(); }
 // Performs all I/O for a single client request to the server, and
 // shuts down the client (by exit or signal).
 static ATTRIBUTE_NORETURN void SendServerRequest(
-    const WorkspaceLayout *workspace_layout, BlazeServer *server) {
+  const WorkspaceLayout *workspace_layout, BlazeServer *server) {
   while (true) {
     if (!server->Connected()) {
       StartServerAndConnect(workspace_layout, server);

src/main/cpp/global_variables.h

@@ -68,6 +68,9 @@ struct GlobalVariables {
   // The path of the JVM executable that should be used to launch Blaze.
   std::string jvm_path;
 
+  // Version of the JVM.
+  std::string jvm_version;
+
   // TODO(laszlocsomor) 2016-11-28: move pid_t usage out of here and whereever
   // else it appears. Find some way to not have to declare a pid_t here, either
   // by making PID handling platform-independent or some other idea.

src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java

@@ -497,7 +497,12 @@ private void addWorkspaceFunctions(Environment workspaceEnv, StoredEventHandler
         workspaceEnv.update("__workspace_dir__", workspaceDir.getPathString());
       }
       File jreDirectory = new File(System.getProperty("java.home"));
-      workspaceEnv.update("DEFAULT_SERVER_JAVABASE", jreDirectory.getParentFile().toString());
+      if (jreDirectory.getName().toLowerCase() == "jre") {
+        workspaceEnv.update("DEFAULT_SERVER_JAVABASE", jreDirectory.getParentFile().toString());
+      } else {
+        // Mostly this is running on JDK 9 which does not have jre/ directory.
+        workspaceEnv.update("DEFAULT_SERVER_JAVABASE", jreDirectory.toString());
+      }
 
       for (EnvironmentExtension extension : environmentExtensions) {
         extension.updateWorkspace(workspaceEnv);

tools/jdk/BUILD

@@ -108,11 +108,21 @@ filegroup(
     srcs = ["//tools/jdk:JavaBuilder_deploy.jar"],
 )
 
+filegroup(
+    name = "javabuilder_nojavac",
+    srcs = ["//tools/jdk:JavaBuilderNoJavac_deploy.jar"],
+)
+
 filegroup(
     name = "vanillajavabuilder",
     srcs = ["//tools/jdk:VanillaJavaBuilder_deploy.jar"],
 )
 
+filegroup(
+    name = "dummy",
+    srcs = ["//tools/jdk:libdummy.jar"],
+)
+
 BOOTCLASS_JARS = [
     "rt.jar",
     "resources.jar",
@@ -195,6 +205,43 @@ java_toolchain(
     target_version = "8",
 )
 
+java_toolchain(
+    name = "jdk9",
+    bootclasspath = [],
+    compatible_javacopts = {
+        # Restrict protos to Java 7 so that they are compatible with Android.
+        "proto": [
+            "-source",
+            "7",
+            "-target",
+            "7",
+            "-XDallowBetterNullChecks=false",
+        ],
+    },
+    encoding = "UTF-8",
+    extclasspath = [":extclasspath"],
+    forcibly_disable_header_compilation = 1,
+    genclass = ["@bazel_tools//tools/jdk:genclass"],
+    header_compiler = ["@bazel_tools//tools/jdk:turbine"],
+    ijar = ["@bazel_tools//tools/jdk:ijar"],
+    javabuilder = ["@bazel_tools//tools/jdk:javabuilder_nojavac"],
+    javac = ["@bazel_tools//tools/jdk:dummy"],
+    javac_supports_workers = 1,
+    jvm_opts = [
+        "--add-opens=java.base/java.nio=ALL-UNNAMED",
+        "-XX:+TieredCompilation",
+        "-XX:TieredStopAtLevel=1",
+    ],
+    misc = [
+        "-XDskipDuplicateBridges=true",
+        "-g",
+        "-parameters",
+    ],
+    singlejar = ["@bazel_tools//tools/jdk:singlejar"],
+    source_version = "9",
+    target_version = "9",
+)
+
 filegroup(
     name = "srcs",
     srcs = [