Rollback of commit 162d5b276e1539b1acc44afcd4a4ccadcf99023a.

*** Reason for rollback ***

Breaks targets that have the same .m file in both srcs and hdrs.

*** Original change description ***

Allow private header files in the srcs attribute of objc_* rules.

This uses CppModuleMap and CppModuleMapAction to generate clang module maps for the target and its transitive dependencies. clang enforces private header usage through these maps. Right now module maps are interpreted but modules aren't enabled.

RELNOTES: Allow private header files in the srcs attribute of objc_* rules.

--
MOS_MIGRATED_REVID=95916531

1 files changed, 1 insertions, 13 deletions

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 6cc286dcbc..9e1372e8d4 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
@@ -16,13 +16,10 @@ package com.google.devtools.build.lib.rules.objc;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.Root;
 import com.google.devtools.build.lib.analysis.AnalysisEnvironment;
 import com.google.devtools.build.lib.analysis.AnalysisUtils;
-import com.google.devtools.build.lib.rules.cpp.CppFileTypes;
-import com.google.devtools.build.lib.rules.cpp.CppModuleMap;
 import com.google.devtools.build.lib.syntax.Label;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -32,7 +29,7 @@ import com.google.devtools.build.lib.vfs.PathFragment;
  */
 // TODO(bazel-team): This should really be named DerivedArtifacts as it contains methods for
 // final as well as intermediate artifacts.
-public final class IntermediateArtifacts {
+final class IntermediateArtifacts {
 
   /**
    * Extension used on the temporary dsym bundle location. Must end in {@code .dSYM} for dsymutil
@@ -273,13 +270,4 @@ public final class IntermediateArtifacts {
   public Artifact runnerScript() {
     return appendExtension("_runner.sh");
   }
-
-  /**
-   * {@link CppModuleMap} used to enforce proper usage of private headers.
-   */
-  public CppModuleMap moduleMap() {
-    Artifact mapFile =
-        appendExtension(Iterables.getOnlyElement(CppFileTypes.CPP_MODULE_MAP.getExtensions()));
-    return new CppModuleMap(mapFile, ownerLabel.toString());
-  }
 }