diff options
| author |  Cal Peyser <cpeyser@google.com> | 2017-01-31 21:37:31 +0000 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2017-02-01 08:55:30 +0000 |
| commit | cd60c48ea600661259f7a6af8592225635d0d90e (patch) | |
| tree | 4a4ecbc851e39e98a7ea4084bec9302b47b0464f /src/main/java | |
| parent | 92721884c5e7b990552d444588cb00dd6ebfe2a4 (diff) | |
experimental_objc_library uses ImmutableSortedSet to avoid muddling input
order.
--
PiperOrigin-RevId: 146159313
MOS_MIGRATED_REVID=146159313
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java index 0568a6ee74..4d674283e3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java @@ -25,8 +25,8 @@ import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.analysis.RuleContext; @@ -247,10 +247,12 @@ public class CrosstoolCompilationSupport extends CompilationSupport { private CcLibraryHelper createCcLibraryHelper(ObjcProvider objcProvider, VariablesExtension extension) { PrecompiledFiles precompiledFiles = new PrecompiledFiles(ruleContext); - Collection<Artifact> arcSources = Sets.newHashSet(compilationArtifacts.getSrcs()); - Collection<Artifact> nonArcSources = Sets.newHashSet(compilationArtifacts.getNonArcSrcs()); - Collection<Artifact> privateHdrs = Sets.newHashSet(compilationArtifacts.getPrivateHdrs()); - Collection<Artifact> publicHdrs = Sets.newHashSet(attributes.hdrs()); + Collection<Artifact> arcSources = ImmutableSortedSet.copyOf(compilationArtifacts.getSrcs()); + Collection<Artifact> nonArcSources = + ImmutableSortedSet.copyOf(compilationArtifacts.getNonArcSrcs()); + Collection<Artifact> privateHdrs = + ImmutableSortedSet.copyOf(compilationArtifacts.getPrivateHdrs()); + Collection<Artifact> publicHdrs = ImmutableSortedSet.copyOf(attributes.hdrs()); Artifact pchHdr = ruleContext.getPrerequisiteArtifact("pch", Mode.TARGET); ImmutableList<Artifact> pchHdrList = (pchHdr != null) ? ImmutableList.<Artifact>of(pchHdr) : ImmutableList.<Artifact>of(); |