From 8977a05681255bc521457cd891373d4cd306a142 Mon Sep 17 00:00:00 2001 From: Lukacs Berki Date: Fri, 21 Aug 2015 14:34:39 +0000 Subject: Remove an AnalysisEnvironment.getDerivedArtifact() call from nativedeps. -- MOS_MIGRATED_REVID=101218538 --- .../google/devtools/build/lib/rules/nativedeps/NativeDepsHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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(); -- cgit v1.2.3