Rollback of commit 16444baf21780c4bff00b9736b268e97157e6bc2.

*** Reason for rollback ***

Breaks targets. See []

Manually verified this unbreaks the target mentioned in the bug.

*** Original change description ***

Do not compile source files mentioned in 'hdrs'.

Currently for a library:
  cc_library(name='a', hdrs=['a.cc'])
we compile a.cc into a.pic.o and link that into its reverse dependencies.

With this change, a .cc file in hdrs will be treated like a .inc file or
a file in textual_hdrs.

--
MOS_MIGRATED_REVID=113568452

1 files changed, 4 insertions, 7 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IosFramework.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IosFramework.java
index d60a62f4d9..0c553b2bfb 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/IosFramework.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IosFramework.java
@@ -32,11 +32,9 @@ import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode;
 import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.actions.SymlinkAction;
-import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.rules.apple.DottedVersion;
 import com.google.devtools.build.lib.rules.cpp.CcCommon;
 import com.google.devtools.build.lib.rules.objc.ReleaseBundlingSupport.SplitArchTransition.ConfigurationDistinguisher;
-import com.google.devtools.build.lib.util.Pair;
 import com.google.devtools.build.lib.vfs.PathFragment;
 
 /**
@@ -86,8 +84,7 @@ public class IosFramework extends ReleaseBundlingTargetFactory {
     IntermediateArtifacts intermediateArtifacts =
         ObjcRuleClasses.intermediateArtifacts(ruleContext);
 
-    ImmutableList<Pair<Artifact, Label>> headers =
-        ImmutableList.copyOf(CcCommon.getHeaders(ruleContext));
+    ImmutableList<Artifact> headers = ImmutableList.copyOf(CcCommon.getHeaders(ruleContext));
 
     ImmutableMap.Builder<Artifact, Artifact> builder = new ImmutableMap.Builder<>();
 
@@ -97,11 +94,11 @@ public class IosFramework extends ReleaseBundlingTargetFactory {
     builder.put(intermediateArtifacts.combinedArchitectureBinary(), frameworkBinary);
 
     // Create framework headers
-    for (Pair<Artifact, Label> header : headers) {
+    for (Artifact header : headers) {
       Artifact frameworkHeader =
-          outputArtifact(ruleContext, new PathFragment("Headers/" + header.first.getFilename()));
+          outputArtifact(ruleContext, new PathFragment("Headers/" + header.getFilename()));
 
-      builder.put(header.first, frameworkHeader);
+      builder.put(header, frameworkHeader);
     }
 
     return builder.build();