diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2016-04-22 11:42:34 +0000 |
|---|---|---|
| committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-04-22 11:53:26 +0000 |
| commit | 9e4c78fb5752fa554db82815f7336255831a95ab (patch) | |
| tree | fdf498cf18c1e875fc4be3d00afb5f99583ee1a9 /src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD | |
| parent | 8ed31f05e664e925ad628ab47feeaaab30c26283 (diff) | |
Automated [] rollback of commit 857cda2c45a5cc68c3fa398311c48c571a64915d and commit 790d2f6009d47fe92cf0cd92a1473bbf0141f32e.
*** Reason for rollback ***
Broke non-Bazel projects on ci.bazel.io
Fixes #1168
*** Original change description ***
Move the runfiles for external repositories to under the x.runfiles/ directory
This also sets the Bazel workspace name to io_bazel_source.
Fixes #848.
Relevant to #1116, #1124,
RELNOTES[INC]: All repositories are now directly under the x.runfiles directory in the runfiles tree (previously, external repositories were at x.runfiles/main-repo/external/other-repo. This simplifies handling remote repository runfiles considerably, but will break existing references to external repository runfiles....
***
--
MOS_MIGRATED_REVID=120535721
Diffstat (limited to 'src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD')
| -rw-r--r-- | src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD | 3 |
1 files changed, 1 insertions, 2 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 790cfbc068..22929e225a 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 @@ -14,7 +14,6 @@ genrule( outs = ["JavacBootclasspathLocations.java"], cmd = """ declare -a paths=($(SRCS)) && paths=($${paths[@]#$(GENDIR)/}) && -paths=($$(echo $${paths[@]} | sed s_external/__g)) && IFS=: && cat > $@ <<EOF package com.google.devtools.build.java.bazel; @@ -45,7 +44,7 @@ genrule( srcs = ["//third_party/java/jdk/langtools:javac_jar"], outs = ["JavaLangtoolsLocation.java"], cmd = """ -path=$(SRCS) && path=$${path#$(GENDIR)/} && path="io_bazel/$${path}" && +path=$(SRCS) && path=$${path#$(GENDIR)/} && cat > $@ <<EOF package com.google.devtools.build.java.bazel; public class JavaLangtoolsLocation { |