diff options
| author |  Chris Parsons <cparsons@google.com> | 2017-01-26 19:53:33 +0000 |
|---|---|---|
| committer |  Laszlo Csomor <laszlocsomor@google.com> | 2017-01-26 23:02:15 +0000 |
| commit | e2fbeb36f341cd4612692307a95e8be7a2e89744 (patch) | |
| tree | 97cf841ff9af1c2904d792cdd483b5b166bd8996 /src/main/java/com/google/devtools | |
| parent | e2239cc61ca170ff9a65e1a94c3344d2b272c9e2 (diff) | |
Root j2objc linker artifacts underneath the appropriate child configuration
--
PiperOrigin-RevId: 145701736
MOS_MIGRATED_REVID=145701736
Diffstat (limited to 'src/main/java/com/google/devtools')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java | 3 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java index dec209fd70..7f2191a1c7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java @@ -864,7 +864,8 @@ public abstract class CompilationSupport { j2objcArchive.getOwner().toPathFragment(), ".param.j2objc"); Artifact paramFile = ruleContext.getUniqueDirectoryArtifact( - "_j2objc_pruned", paramFilePath, ruleContext.getBinOrGenfilesDirectory()); + "_j2objc_pruned", paramFilePath, + buildConfiguration.getBinDirectory(ruleContext.getRule().getRepository())); Artifact prunedJ2ObjcArchive = intermediateArtifacts.j2objcPrunedArchive(j2objcArchive); Artifact dummyArchive = Iterables.getOnlyElement( diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java index 592cfb4e38..2f588e7c6c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java @@ -432,7 +432,7 @@ public final class IntermediateArtifacts { return ruleContext.getUniqueDirectoryArtifact( "_j2objc_pruned", prunedSourceArtifactPath, - ruleContext.getBinOrGenfilesDirectory()); + buildConfiguration.getBinDirectory(ruleContext.getRule().getRepository())); } /** |