From 7a58fdc827434ce1b872c17cda1b0a0220842387 Mon Sep 17 00:00:00 2001 From: Cal Peyser Date: Wed, 18 Jan 2017 20:07:09 +0000 Subject: Introduce --experimental_objc_crosstool, which replaces --experimental_objc_library and --experimental_objc_use_crosstool_for_binary. This flag will allow testing of the complete (compilation and linking) rollout of the objc crosstool. -- PiperOrigin-RevId: 144864301 MOS_MIGRATED_REVID=144864301 --- src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java index 2902cdc65b..f104dc72b9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java @@ -32,7 +32,6 @@ import com.google.devtools.build.lib.analysis.RunfilesSupport; import com.google.devtools.build.lib.analysis.actions.ExecutionRequirements; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; -import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory; import com.google.devtools.build.lib.rules.apple.AppleConfiguration; import com.google.devtools.build.lib.rules.apple.Platform.PlatformType; @@ -151,7 +150,7 @@ public final class IosTest implements RuleConfiguredTargetFactory { ruleContext.getPrerequisites("deps", Mode.TARGET, J2ObjcEntryClassProvider.class)) .build(); - new LegacyCompilationSupport(ruleContext) + CompilationSupport.create(ruleContext) .registerLinkActions( common.getObjcProvider(), j2ObjcMappingFileProvider, @@ -202,7 +201,7 @@ public final class IosTest implements RuleConfiguredTargetFactory { NestedSetBuilder.stableOrder().addTransitive(filesToBuildSet); InstrumentedFilesProvider instrumentedFilesProvider = - new LegacyCompilationSupport(ruleContext).getInstrumentedFilesProvider(common); + CompilationSupport.create(ruleContext).getInstrumentedFilesProvider(common); TestSupport testSupport = new TestSupport(ruleContext) -- cgit v1.2.3