diff options
author | janakr <janakr@google.com> | 2018-02-05 11:03:18 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-02-05 11:05:19 -0800 |
commit | 8b17efaf80a056d88ec17f3b5d0284dcf149fcb8 (patch) | |
tree | 303ab768403d8e7c619204715d9017cd7ffba0ef /src/main/java/com/google/devtools/build/lib | |
parent | 5fd3ff9d030f855b7374c2bdba6d3cf1b71f99ca (diff) |
Tag a few aspect classes with @AutoCodec and make CcProtoAspect abstract, since it's never instantiated on its own.
PiperOrigin-RevId: 184554483
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverlinkAspect.java | 6 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverlinkAspect.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverlinkAspect.java index ff56c613fe..42858be571 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverlinkAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverlinkAspect.java @@ -28,6 +28,8 @@ import com.google.devtools.build.lib.rules.java.JavaCommon; import com.google.devtools.build.lib.rules.java.JavaInfo; import com.google.devtools.build.lib.rules.java.JavaRuntimeJarProvider; import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget; +import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; +import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import java.util.ArrayList; import java.util.List; @@ -39,7 +41,11 @@ import java.util.List; * <p>One would think that using the compile time classpath would be enough, but alas, those are * ijars, */ +@AutoCodec public class AndroidNeverlinkAspect extends NativeAspectClass implements ConfiguredAspectFactory { + public static final ObjectCodec<AndroidNeverlinkAspect> CODEC = + new AndroidNeverlinkAspect_AutoCodec(); + public static final String NAME = "AndroidNeverlinkAspect"; private static final ImmutableList<String> ATTRIBUTES = ImmutableList.of( diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java index 4d66952eab..a3cc7bfacb 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java @@ -67,7 +67,7 @@ import java.util.ArrayList; import java.util.Collection; /** Part of the implementation of cc_proto_library. */ -public class CcProtoAspect extends NativeAspectClass implements ConfiguredAspectFactory { +public abstract class CcProtoAspect extends NativeAspectClass implements ConfiguredAspectFactory { private static final String PROTO_TOOLCHAIN_ATTR = ":aspect_cc_proto_toolchain"; @@ -80,7 +80,7 @@ public class CcProtoAspect extends NativeAspectClass implements ConfiguredAspect private final CppSemantics cppSemantics; private final LabelLateBoundDefault<?> ccToolchainAttrValue; - public CcProtoAspect( + protected CcProtoAspect( AspectLegalCppSemantics cppSemantics, LabelLateBoundDefault<?> ccToolchainAttrValue) { this.cppSemantics = cppSemantics; this.ccToolchainAttrValue = ccToolchainAttrValue; |