aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Lukacs Berki <lberki@google.com>2015-08-21 14:34:39 +0000
committerGravatar Han-Wen Nienhuys <hanwen@google.com>2015-08-24 14:01:51 +0000
commit8977a05681255bc521457cd891373d4cd306a142 (patch)
tree89a55a9df7a2801a6a39f021b4e3139cb3cfa4b7 /src
parent98317a35a4c005386cb7f4595cf0917281d0c312 (diff)
Remove an AnalysisEnvironment.getDerivedArtifact() call from nativedeps.
-- MOS_MIGRATED_REVID=101218538
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/nativedeps/NativeDepsHelper.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/nativedeps/NativeDepsHelper.java b/src/main/java/com/google/devtools/build/lib/rules/nativedeps/NativeDepsHelper.java
index 0a509cd722..56ed3e02ec 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/nativedeps/NativeDepsHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/nativedeps/NativeDepsHelper.java
@@ -196,7 +196,7 @@ public abstract class NativeDepsHelper {
// mangle path names such that the library's conventional _solib RPATH entry
// no longer resolves (because the target directory's relative depth gets lost).
for (final Artifact runtimeInput : toolchain.getDynamicRuntimeLinkInputs()) {
- final Artifact runtimeSymlink = ruleContext.getAnalysisEnvironment().getDerivedArtifact(
+ final Artifact runtimeSymlink = ruleContext.getPackageRelativeArtifact(
getRuntimeLibraryPath(ruleContext, runtimeInput), bindirIfShared);
// Since runtime library symlinks are underneath the target's output directory and
// multiple targets may share the same output directory, we need to make sure this
@@ -221,7 +221,7 @@ public abstract class NativeDepsHelper {
* symlink for the native library for the specified rule.
*/
private static PathFragment getRuntimeLibraryPath(RuleContext ruleContext, Artifact lib) {
- PathFragment relativePath = Util.getWorkspaceRelativePath(ruleContext.getRule());
+ PathFragment relativePath = new PathFragment(ruleContext.getLabel().getName());
PathFragment libParentDir =
relativePath.replaceName(lib.getExecPath().getParentDirectory().getBaseName());
String libName = lib.getExecPath().getBaseName();