diff options
| author |  Googler <noreply@google.com> | 2017-04-29 04:44:11 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-04-30 23:14:13 +0200 |
| commit | e7fe50aa727df9ef0a3d37fa258d017971035515 (patch) | |
| tree | 8513a612248d4e3f9f89588d24926c4e8e7f39d9 /src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java | |
| parent | 5f31944b8942818aaf53571c76f5c6a9a9dafc72 (diff) | |
Automated g4 rollback of commit a83a5df53ca184ad59a4a46cd9dfa747bf08007a.
*** Reason for rollback ***
This caused some build breaks.
*** Original change description ***
Custom module map for j2objc_library
PiperOrigin-RevId: 154608761
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java | 3 |
1 files changed, 1 insertions, 2 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 b5d6f6b883..96bdf501c5 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 @@ -381,8 +381,7 @@ public class CrosstoolCompilationSupport extends CompilationSupport { ImmutableSortedSet.copyOf(compilationArtifacts.getNonArcSrcs()); Collection<Artifact> privateHdrs = ImmutableSortedSet.copyOf(compilationArtifacts.getPrivateHdrs()); - Collection<Artifact> publicHdrs = ImmutableSortedSet.copyOf( - Iterables.concat(attributes.hdrs(), compilationArtifacts.getAdditionalHdrs())); + Collection<Artifact> publicHdrs = ImmutableSortedSet.copyOf(attributes.hdrs()); Artifact pchHdr = null; if (ruleContext.attributes().has("pch", BuildType.LABEL)) { pchHdr = ruleContext.getPrerequisiteArtifact("pch", Mode.TARGET); |