From c479a8eb53da5581bb2407d826085bf6bfd02779 Mon Sep 17 00:00:00 2001 From: Cal Peyser Date: Mon, 5 Sep 2016 15:00:14 +0000 Subject: Rollback of commit 4689c5d1d2faf902846b100b8d858d172a0ceb3d. *** Reason for rollback *** Prunes .modulemap files incorrectly. See []. *** Original change description *** Implement input pruning using .d files in objc. -- MOS_MIGRATED_REVID=132246906 --- .../devtools/build/lib/rules/objc/IntermediateArtifacts.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/IntermediateArtifacts.java') 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 811e698ff7..9b8ced2dfd 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 @@ -20,7 +20,6 @@ import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.rules.cpp.CppCompileAction.DotdFile; import com.google.devtools.build.lib.rules.cpp.CppModuleMap; import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.lib.vfs.FileSystemUtils; @@ -398,9 +397,11 @@ public final class IntermediateArtifacts { return appendExtension("_runner.sh"); } - /** Dependency file that is generated when compiling the {@code source} artifact. */ - public DotdFile dotdFile(Artifact source) { - return new DotdFile(inUniqueObjsDir(source, ".d")); + /** + * Dependency file that is generated when compiling the {@code source} artifact. + */ + public Artifact dotdFile(Artifact source) { + return inUniqueObjsDir(source, ".d"); } /** -- cgit v1.2.3