From a84e9e4dcc4bdc1a3b3f39605421ff7a451894d6 Mon Sep 17 00:00:00 2001 From: cpeyser Date: Wed, 14 Feb 2018 13:14:13 -0800 Subject: Add a CODEC for CppCompileAction. PiperOrigin-RevId: 185733313 --- src/main/java/com/google/devtools/build/lib/rules/objc/BUILD | 1 + .../com/google/devtools/build/lib/rules/objc/CompilationSupport.java | 2 +- .../java/com/google/devtools/build/lib/rules/objc/HeaderThinning.java | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD b/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD index c9022b5d3f..d6c8cf42ab 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD @@ -25,6 +25,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/analysis/platform", "//src/main/java/com/google/devtools/build/lib/collect", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", + "//src/main/java/com/google/devtools/build/lib/collect/nestedset:serialization", "//src/main/java/com/google/devtools/build/lib/concurrent", "//src/main/java/com/google/devtools/build/lib/profiler", "//src/main/java/com/google/devtools/build/lib/rules/apple", diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java index b6bd529655..2a69298e45 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java @@ -300,7 +300,7 @@ public class CompilationSupport { } return new HeaderThinning(potentialInputs); } else { - return new NoProcessing(); + return NoProcessing.INSTANCE; } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/HeaderThinning.java b/src/main/java/com/google/devtools/build/lib/rules/objc/HeaderThinning.java index dcd8bca663..3291a405f4 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/HeaderThinning.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/HeaderThinning.java @@ -24,6 +24,8 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.rules.cpp.CppCompileAction; import com.google.devtools.build.lib.rules.cpp.IncludeProcessing; import com.google.devtools.build.lib.rules.cpp.IncludeScanner.IncludeScannerSupplier; +import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; +import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.PathFragment; import java.io.IOException; @@ -42,7 +44,9 @@ import javax.annotation.Nullable; *

Reads the .headers_list output file if one was generated for the actions source file and * returns the Artifact objects associated with the headers that were found. */ +@AutoCodec public class HeaderThinning implements IncludeProcessing { + public static final ObjectCodec CODEC = new HeaderThinning_AutoCodec(); private final Iterable potentialInputs; -- cgit v1.2.3