diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java index 36624d85a7..2049d04166 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java @@ -43,12 +43,11 @@ import com.google.devtools.build.lib.rules.cpp.CppConfigurationLoader.CppConfigu import com.google.devtools.build.lib.rules.cpp.CrosstoolConfigurationLoader.CrosstoolFile; import com.google.devtools.build.lib.rules.cpp.transitions.ContextCollectorOwnerTransition; import com.google.devtools.build.lib.rules.cpp.transitions.DisableLipoTransition; -import com.google.devtools.build.lib.skyframe.serialization.InjectingObjectCodec; +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.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory; -import com.google.devtools.build.lib.vfs.FileSystemProvider; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig; @@ -62,7 +61,7 @@ import javax.annotation.Nullable; * architecture, target architecture, compiler version, and a standard library version. It has * information about the tools locations and the flags required for compiling. */ -@AutoCodec(dependency = FileSystemProvider.class) +@AutoCodec @SkylarkModule( name = "cpp", doc = "A configuration fragment for C++.", @@ -70,8 +69,7 @@ import javax.annotation.Nullable; ) @Immutable public final class CppConfiguration extends BuildConfiguration.Fragment { - public static final InjectingObjectCodec<CppConfiguration, FileSystemProvider> CODEC = - new CppConfiguration_AutoCodec(); + public static final ObjectCodec<CppConfiguration> CODEC = new CppConfiguration_AutoCodec(); /** * String indicating a Mac system, for example when used in a crosstool configuration's host or |