diff options
| author |  hlopko <hlopko@google.com> | 2018-06-15 09:10:05 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-15 09:11:41 -0700 |
| commit | 8820d3ae601f229b72c61d2eb601b0e8e9b0111a (patch) | |
| tree | 02caa729cae33cb2414cbda033313705cf0278b9 /src/main/java/com/google/devtools/build/lib/rules/cpp/proto | |
| parent | b36470e6e0073a76012afbed7ba9cf9c32ef002c (diff) | |
Remove LIPO support
RELNOTES: Support for LIPO has been fully removed.
PiperOrigin-RevId: 200724578
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 | 9 |
1 files changed, 1 insertions, 8 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 2060f0c582..9b49079b19 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,8 +52,6 @@ import com.google.devtools.build.lib.rules.cpp.CppConfiguration; 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.TransitiveLipoInfoProvider; -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; @@ -122,12 +120,7 @@ public abstract class CcProtoAspect extends NativeAspectClass implements Configu .value(PROTO_TOOLCHAIN_LABEL)) .add( attr(CcToolchain.CC_TOOLCHAIN_DEFAULT_ATTRIBUTE_NAME, LABEL) - .value(ccToolchainAttrValue)) - .add( - attr(TransitiveLipoInfoProvider.LIPO_CONTEXT_COLLECTOR, LABEL) - .cfg(LipoContextCollectorTransition.INSTANCE) - .value(CppRuleClasses.LIPO_CONTEXT_COLLECTOR) - .skipPrereqValidatorCheck()); + .value(ccToolchainAttrValue)); return result.build(); } |