diff options
| author |  cushon <cushon@google.com> | 2018-05-14 01:51:45 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-14 01:53:21 -0700 |
| commit | 849df36c5ad31ebe8791c4228321c38c6d0ae56c (patch) | |
| tree | cc39afc4e667214b4aac69217fb697166c96ddd4 /src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java | |
| parent | 5c3f5c9be7fa40d4fb3c35756891fab8483ca406 (diff) | |
Use the local JDK as the default target javabase
and continue to use the embedded JDK as the default host_javabase.
PiperOrigin-RevId: 196471714
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java index d71830427d..7ca43d003b 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java @@ -147,7 +147,10 @@ public abstract class AbstractPackageLoader implements PackageLoader { Path devNull = workspaceDir.getFileSystem().getPath("/dev/null"); directories = new BlazeDirectories( - new ServerDirectories(installBase, outputBase, devNull), workspaceDir, "blaze"); + new ServerDirectories(installBase, outputBase, devNull), + workspaceDir, + /* defaultSystemJavabase= */ null, + "blaze"); this.pkgLocator = new PathPackageLocator( |