diff options
| author |  Kristina Chodorow <kchodorow@google.com> | 2016-09-19 18:08:59 +0000 |
|---|---|---|
| committer |  Laszlo Csomor <laszlocsomor@google.com> | 2016-09-20 06:45:52 +0000 |
| commit | 82d43279f93d95e4c41b4bc598a3cc05ddd1ae1a (patch) | |
| tree | 6554cd4499ca265d9ad9ae1d3ef9867afe97e0c6 /src/java_tools | |
| parent | 35b50d26893147c642eeb48b8247350a87f03741 (diff) | |
Change execution root for external repositories to be ../repo
Some of the important aspect of this change:
* Remote repos in the execution root are under output_base/execroot/repo_name, so the prefix is ../repo_name (to escape the local workspace name).
* Package roots for external repos were previously "output_base/", they are now output_base/external/repo_name (which means source artifacts always have a relative path from their repository).
* Outputs are under bazel-bin/external/repo_name/ (or similarly under genfiles). Note that this is a bit of a change from how this was implemented in the previous cl.
Fixes #1262.
RELNOTES[INC]: Previously, an external repository would be symlinked into the
execution root at execroot/local_repo/external/remote_repo. This changes it to
be at execroot/remote_repo. This may break genrules/Skylark actions that
hardcode execution root paths. If this causes breakages for you, ensure that
genrules are using $(location :target) to access files and Skylark rules are
using http://bazel.io/docs/skylark/lib/File.html's path, dirname, etc.
functions.
Roll forward of bdfd58a.
--
MOS_MIGRATED_REVID=133606309
Diffstat (limited to 'src/java_tools')
| -rw-r--r-- | src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD index 3ede677953..8818072e3a 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD @@ -12,7 +12,7 @@ genrule( name = "javac-bootclasspath-locations", srcs = ["@bazel_tools//tools/jdk:bootclasspath"], outs = ["JavacBootclasspathLocations.java"], - cmd = "$(location javac-bootclasspath-locations.sh) $@ $(GENDIR) '' $(SRCS)", + cmd = "$(location javac-bootclasspath-locations.sh) $@ $(GENDIR) 'bazel_tools/' $(SRCS)", tools = ["javac-bootclasspath-locations.sh"], ) |