diff options
author | 2016-07-04 12:57:25 +0000 | |
---|---|---|
committer | 2016-07-04 14:02:50 +0000 | |
commit | 74dcfee2daa23934178579b2e5987178c51c73e2 (patch) | |
tree | 0ca6abfcf43359103d0006ad0f61ac0a70e3f3dc /src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java | |
parent | c4aeb0424f5882c7f3b6497a1e4c21c285d6fd0a (diff) |
Use the subprocess factory that uses the Win32 API on Windows.
We should really do something about the mess that is loading our JNI libraries -- io.bazel.EnableJNI is mentioned eight times in the code in various diverse contexts. This change is not the right place to do it, though.
--
MOS_MIGRATED_REVID=126570481
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java index f11b51a05f..f95aecd3e3 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java @@ -71,6 +71,9 @@ import com.google.devtools.build.lib.runtime.proto.InvocationPolicyOuterClass.In import com.google.devtools.build.lib.server.AfUnixServer; import com.google.devtools.build.lib.server.RPCServer; import com.google.devtools.build.lib.server.signal.InterruptSignalHandler; +import com.google.devtools.build.lib.shell.JavaSubprocessFactory; +import com.google.devtools.build.lib.shell.Subprocess; +import com.google.devtools.build.lib.shell.SubprocessBuilder; import com.google.devtools.build.lib.skyframe.DiffAwareness; import com.google.devtools.build.lib.skyframe.PrecomputedValue; import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutorFactory; @@ -93,6 +96,7 @@ import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.UnixFileSystem; import com.google.devtools.build.lib.vfs.WindowsFileSystem; +import com.google.devtools.build.lib.windows.WindowsSubprocessFactory; import com.google.devtools.build.skyframe.SkyFunction; import com.google.devtools.build.skyframe.SkyFunctionName; import com.google.devtools.common.options.Option; @@ -893,6 +897,14 @@ public final class BlazeRuntime { return OS.getCurrent() == OS.WINDOWS ? new WindowsFileSystem() : new UnixFileSystem(); } + private static Subprocess.Factory subprocessFactoryImplementation() { + if (!"0".equals(System.getProperty("io.bazel.EnableJni")) && OS.getCurrent() == OS.WINDOWS) { + return WindowsSubprocessFactory.INSTANCE; + } else { + return JavaSubprocessFactory.INSTANCE; + } + } + /** * Creates and returns a new Blaze RPCServer. Call {@link RPCServer#serve()} to start the server. */ @@ -1028,7 +1040,9 @@ public final class BlazeRuntime { if (fs == null) { fs = fileSystemImplementation(); } + Path.setFileSystemForSerialization(fs); + SubprocessBuilder.setSubprocessFactory(subprocessFactoryImplementation()); Path installBasePath = fs.getPath(installBase); Path outputBasePath = fs.getPath(outputBase); |