diff options
| author |  Lukacs Berki <lberki@google.com> | 2015-03-23 10:47:44 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2015-03-23 11:58:13 +0000 |
| commit | 44a0f2b2f5d53d3e07512a563cd2bc16cf7180d4 (patch) | |
| tree | c1b4a8c1c5bcdac795568809d5db5a00cba0116d /src/main/java/com/google/devtools/build | |
| parent | 2cb94fe51aefd225bceeaf150ca82ef807abd256 (diff) | |
A minor change in the path of ijars: previously the exec path of a java_binary was a prefix of the exec path of the associated ijar, which may cause problems.
This was discovered using my "bindir == genfilesdir == outputdir" experiment.
--
MOS_MIGRATED_REVID=89285440
Diffstat (limited to 'src/main/java/com/google/devtools/build')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/BaseJavaCompilationHelper.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/BaseJavaCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/BaseJavaCompilationHelper.java index 3f8448a010..f0b4bdec68 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/BaseJavaCompilationHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/BaseJavaCompilationHelper.java @@ -136,8 +136,7 @@ public class BaseJavaCompilationHelper { private Artifact getIjarArtifact(Artifact jar, boolean addPrefix) { if (addPrefix) { - PathFragment ruleBase = ruleContext.getLabel().getPackageIdentifier().getPathFragment() - .getRelative(ruleContext.getLabel().getName()).getRelative("_ijars"); + PathFragment ruleBase = ruleContext.getUniqueDirectory("_ijar"); PathFragment artifactDirFragment = jar.getRootRelativePath().getParentDirectory(); String ijarBasename = FileSystemUtils.removeExtension(jar.getFilename()) + "-ijar.jar"; return getAnalysisEnvironment().getDerivedArtifact( |