diff options
| author |  gregce <gregce@google.com> | 2017-09-16 06:20:44 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-09-18 11:29:01 +0200 |
| commit | ce1129e940bee67e5312e3168534e7c92cd0e57f (patch) | |
| tree | 76140cde205697533bdbd373e43ab4ef40fd93f7 /src/main/java/com/google/devtools/build/lib/rules/cpp/proto | |
| parent | de6fd92656ed5f7be648ca59c45017bf05567e0c (diff) | |
Remove LipoTransition (and replace remaining LIPO_COLLECTOR references).
Rules should now be configured directly with patch transitions.
This brings down our transition interfaces to: Transition, ConfigurationTransition, SplitTransition, PatchTransition.
PiperOrigin-RevId: 168927364
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/proto')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 7415a1044f..820bc46087 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 @@ -52,6 +52,7 @@ import com.google.devtools.build.lib.rules.cpp.CppHelper; import com.google.devtools.build.lib.rules.cpp.CppRuleClasses; import com.google.devtools.build.lib.rules.cpp.CppSemantics; import com.google.devtools.build.lib.rules.cpp.FeatureSpecification; +import com.google.devtools.build.lib.rules.cpp.transitions.LipoContextCollectorTransition; import com.google.devtools.build.lib.rules.proto.ProtoCommon; import com.google.devtools.build.lib.rules.proto.ProtoCompileActionBuilder; import com.google.devtools.build.lib.rules.proto.ProtoCompileActionBuilder.ToolchainInvocation; @@ -125,7 +126,7 @@ public class CcProtoAspect extends NativeAspectClass implements ConfiguredAspect .value(ccToolchainAttrValue)) .add( attr(":lipo_context_collector", LABEL) - .cfg(CppRuleClasses.LipoTransition.LIPO_COLLECTOR) + .cfg(LipoContextCollectorTransition.INSTANCE) .value(CppRuleClasses.LIPO_CONTEXT_COLLECTOR) .skipPrereqValidatorCheck()); |