diff options
| author |  gregce <gregce@google.com> | 2018-05-25 13:20:05 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-25 13:21:22 -0700 |
| commit | 10a6130dbafdf4e5f61198bec08b88fe6d6381fe (patch) | |
| tree | 312206338ed1134fc6d4ed8e9e82e702d81b1f64 /src/main/java/com/google/devtools | |
| parent | c6cf1b94ea0753bb1cc7d0df8c5a8a2762a53eab (diff) | |
Skylark: Make 'cfg = "data"' a noop.
This is no longer meaningful with the turndown of
(C++) LIPO.
PiperOrigin-RevId: 198092974
Diffstat (limited to 'src/main/java/com/google/devtools')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttr.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttr.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttr.java index a7ecf893e9..94f893ad8b 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttr.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttr.java @@ -20,7 +20,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.analysis.config.HostTransition; -import com.google.devtools.build.lib.analysis.config.transitions.PatchTransition; import com.google.devtools.build.lib.analysis.config.transitions.SplitTransition; import com.google.devtools.build.lib.events.Location; import com.google.devtools.build.lib.packages.Attribute; @@ -45,7 +44,6 @@ import com.google.devtools.build.lib.syntax.SkylarkCallbackFunction; import com.google.devtools.build.lib.syntax.SkylarkDict; import com.google.devtools.build.lib.syntax.SkylarkList; import com.google.devtools.build.lib.syntax.SkylarkType; -import com.google.devtools.build.lib.syntax.SkylarkUtils; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.syntax.Type.ConversionException; import com.google.devtools.build.lib.syntax.Type.LabelClass; @@ -226,7 +224,9 @@ public final class SkylarkAttr implements SkylarkAttrApi { if (containsNonNoneKey(arguments, CONFIGURATION_ARG)) { Object trans = arguments.get(CONFIGURATION_ARG); if (trans.equals("data")) { - builder.cfg((PatchTransition) SkylarkUtils.getLipoDataTransition(env)); + // This used to apply the "disable LIPO" (a.k.a. "data") transition. But now that LIPO is + // turned down this is a noop. Still, there are cfg = "data"' references in the depot. So + // we have to remove them via b/28688645 before we can remove this path. } else if (trans.equals("host")) { builder.cfg(HostTransition.INSTANCE); } else if (trans instanceof SplitTransition) { |