From 51f76dbb931b025c6066af91e8c53a9715014b8a Mon Sep 17 00:00:00 2001 From: cpeyser Date: Fri, 7 Jul 2017 11:19:45 -0400 Subject: Platform -> ApplePlatform, to avoid ambiguity with the newly introduced Platform rule. PiperOrigin-RevId: 161203491 --- .../devtools/build/lib/rules/objc/LegacyObjcLibraryTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcLibraryTest.java') diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcLibraryTest.java index 3d931b961b..4305790dca 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcLibraryTest.java @@ -35,8 +35,8 @@ import com.google.devtools.build.lib.analysis.util.ScratchAttributeWriter; import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.packages.NoSuchTargetException; import com.google.devtools.build.lib.packages.util.MockObjcSupport; +import com.google.devtools.build.lib.rules.apple.ApplePlatform; import com.google.devtools.build.lib.rules.apple.AppleToolchain; -import com.google.devtools.build.lib.rules.apple.Platform; import com.google.devtools.build.lib.rules.cpp.HeaderDiscovery; import com.google.devtools.build.lib.rules.cpp.LinkerInput; import com.google.devtools.build.lib.rules.objc.ObjcCommandLineOptions.ObjcCrosstoolMode; @@ -111,7 +111,7 @@ public class LegacyObjcLibraryTest extends ObjcLibraryTest { @Test public void testCompilationActions_simulator() throws Exception { useConfiguration("--cpu=ios_i386", "--ios_minimum_os=1.0"); - Platform platform = Platform.IOS_SIMULATOR; + ApplePlatform platform = ApplePlatform.IOS_SIMULATOR; createLibraryTargetWriter("//objc:lib") .setAndCreateFiles("srcs", "a.m", "b.m", "private.h") .setAndCreateFiles("hdrs", "c.h") @@ -176,7 +176,7 @@ public class LegacyObjcLibraryTest extends ObjcLibraryTest { @Test public void testCompilationActions_device() throws Exception { useConfiguration("--cpu=ios_armv7", "--ios_minimum_os=1.0"); - Platform platform = Platform.IOS_DEVICE; + ApplePlatform platform = ApplePlatform.IOS_DEVICE; createLibraryTargetWriter("//objc:lib") .setAndCreateFiles("srcs", "a.m", "b.m", "private.h") @@ -251,7 +251,7 @@ public class LegacyObjcLibraryTest extends ObjcLibraryTest { @Test public void testCompilationActionsWithPch() throws Exception { - Platform platform = Platform.IOS_SIMULATOR; + ApplePlatform platform = ApplePlatform.IOS_SIMULATOR; scratch.file("objc/foo.pch"); createLibraryTargetWriter("//objc:lib") .setAndCreateFiles("srcs", "a.m", "b.m", "private.h") @@ -298,7 +298,7 @@ public class LegacyObjcLibraryTest extends ObjcLibraryTest { @Test public void testCompilationActionsWithCopts() throws Exception { useConfiguration("--cpu=ios_i386"); - Platform platform = Platform.IOS_SIMULATOR; + ApplePlatform platform = ApplePlatform.IOS_SIMULATOR; createLibraryTargetWriter("//objc:lib") .setAndCreateFiles("srcs", "a.m", "b.m", "private.h") .setAndCreateFiles("hdrs", "c.h") -- cgit v1.2.3