diff options
author | 2016-04-22 11:42:34 +0000 | |
---|---|---|
committer | 2016-04-22 11:53:26 +0000 | |
commit | 9e4c78fb5752fa554db82815f7336255831a95ab (patch) | |
tree | fdf498cf18c1e875fc4be3d00afb5f99583ee1a9 /src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java | |
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/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java index 98540d248a..159349af23 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java @@ -99,8 +99,7 @@ public final class RunfilesSupport { && TargetUtils.isTestRule(ruleContext.getRule())) { TransitiveInfoCollection runUnderTarget = ruleContext.getPrerequisite(":run_under", Mode.DATA); - runfiles = new Runfiles.Builder( - ruleContext.getWorkspaceName(), ruleContext.getConfiguration().legacyExternalRunfiles()) + runfiles = new Runfiles.Builder(ruleContext.getWorkspaceName()) .merge(getRunfiles(runUnderTarget)) .merge(runfiles) .build(); @@ -236,13 +235,6 @@ public final class RunfilesSupport { } /** - * Returns the name of the workspace that the build is occurring in. - */ - public PathFragment getWorkspaceName() { - return runfiles.getSuffix(); - } - - /** * Returns the middleman artifact that depends on getExecutable(), * getRunfilesManifest(), and getRunfilesSymlinkTargets(). Anything which * needs to actually run the executable should depend on this. |