diff options
author | 2016-11-23 21:50:27 +0000 | |
---|---|---|
committer | 2016-11-24 10:32:59 +0000 | |
commit | 270fdd6b4a22f96a3642e7d3bb562b721cde099b (patch) | |
tree | 2e19de42131252e81160f3eade95cd1758e869f4 /src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java | |
parent | f8eba6ab7df665a5ba9820bbc1071186989d25b6 (diff) |
Remove Swift support from native rules
--
MOS_MIGRATED_REVID=140068224
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java index aaa5d80f60..a09e6264c7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java @@ -29,7 +29,6 @@ import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.HEADERS; import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.NON_ARC_SRCS_TYPE; import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.PRECOMPILED_SRCS_TYPE; import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.SRCS_TYPE; -import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.SWIFT_SOURCES; import static java.nio.charset.StandardCharsets.ISO_8859_1; import com.google.common.annotations.VisibleForTesting; @@ -164,7 +163,6 @@ public abstract class CompilationSupport { FileTypeSet.of( ObjcRuleClasses.NON_CPP_SOURCES, ObjcRuleClasses.CPP_SOURCES, - ObjcRuleClasses.SWIFT_SOURCES, HEADERS)) .withSourceAttributes("srcs", "non_arc_srcs", "hdrs") .withDependencyAttributes("deps", "data", "binary", "xctest_app"); @@ -266,13 +264,13 @@ public abstract class CompilationSupport { .build(); } - /** Returns a list of framework search path flags for clang/swift actions. */ + /** Returns a list of framework search path flags for clang actions. */ static Iterable<String> commonFrameworkFlags( ObjcProvider provider, AppleConfiguration appleConfiguration) { return Interspersing.beforeEach("-F", commonFrameworkNames(provider, appleConfiguration)); } - /** Returns a list of frameworks for clang/swift actions. */ + /** Returns a list of frameworks for clang actions. */ static Iterable<String> commonFrameworkNames( ObjcProvider provider, AppleConfiguration appleConfiguration) { Platform platform = appleConfiguration.getSingleArchPlatform(); @@ -294,14 +292,6 @@ public abstract class CompilationSupport { .build(); } - /** Returns the target string for swift compiler. For example, "x86_64-apple-ios8.2" */ - @VisibleForTesting - static String swiftTarget(AppleConfiguration configuration) { - // TODO(bazel-team): Assert the configuration is for an apple platform, or support - // other platform types. - return configuration.getSingleArchitecture() + "-apple-ios" + configuration.getIosSdkVersion(); - } - protected final RuleContext ruleContext; protected final BuildConfiguration buildConfiguration; protected final ObjcConfiguration objcConfiguration; @@ -505,14 +495,6 @@ public abstract class CompilationSupport { ruleContext.attributeError( "srcs", String.format(FILE_IN_SRCS_AND_NON_ARC_SRCS_ERROR_FORMAT, path)); } - - if (appleConfiguration.disableNativeSwiftRules()) { - for (Artifact src : srcsSet) { - if (SWIFT_SOURCES.apply(src.getFilename())) { - ruleContext.attributeError("srcs", "Swift is not supported in native rules."); - } - } - } } ruleContext.assertNoErrors(); |