diff options
| author |  cpeyser <cpeyser@google.com> | 2017-11-02 16:37:33 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-11-03 09:53:14 -0400 |
| commit | 10fb950253d3e947b07dcd18a42777a47e5de695 (patch) | |
| tree | bdbb034eca45b05f1805c2485bc9539d4c9f5e85 /src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java | |
| parent | 7bf7483d0853c753905bd6c582da7dcf878b183d (diff) | |
Automated rollback of commit 5d42ae10195cd1acb9612df3a3d520f09b0c3e39.
*** Reason for rollback ***
Breaks alphago targets.
*** Original change description ***
Remove CppConfiguration#getFeatures in favor of
CcToolchainProvider#getFeatures.
PiperOrigin-RevId: 174373331
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java index 8b8a27ea8e..f90aa1883e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java @@ -40,7 +40,6 @@ import com.google.devtools.build.lib.rules.objc.ObjcProvider.Key; import com.google.devtools.build.lib.rules.proto.ProtoSourcesProvider; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.TreeMap; /** @@ -106,10 +105,7 @@ public class AppleStaticLibrary implements RuleConfiguredTargetFactory { ruleContext.getPrerequisitesByConfiguration("deps", Mode.SPLIT, ObjcProtoProvider.class); Map<String, NestedSet<Artifact>> outputGroupCollector = new TreeMap<>(); - for (Entry<BuildConfiguration, CcToolchainProvider> childConfigAndToolchain : - childConfigurationsAndToolchains.entrySet()) { - BuildConfiguration childConfig = childConfigAndToolchain.getKey(); - CcToolchainProvider childToolchain = childConfigAndToolchain.getValue(); + for (BuildConfiguration childConfig : childConfigurationsAndToolchains.keySet()) { Iterable<ObjcProtoProvider> objcProtoProviders = objcProtoProvidersMap.get(childConfig); ProtobufSupport protoSupport = new ProtobufSupport( @@ -145,7 +141,6 @@ public class AppleStaticLibrary implements RuleConfiguredTargetFactory { new CompilationSupport.Builder() .setRuleContext(ruleContext) .setConfig(childConfig) - .setToolchainProvider(childToolchain) .setOutputGroupCollector(outputGroupCollector) .build(); |