From 270fdd6b4a22f96a3642e7d3bb562b721cde099b Mon Sep 17 00:00:00 2001 From: Dmitry Shevchenko Date: Wed, 23 Nov 2016 21:50:27 +0000 Subject: Remove Swift support from native rules -- MOS_MIGRATED_REVID=140068224 --- .../lib/rules/objc/CompilationAttributes.java | 32 ---------------------- 1 file changed, 32 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java index 3e15538b79..bbb0493f64 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java @@ -34,7 +34,6 @@ import com.google.devtools.build.lib.rules.cpp.CppModuleMap; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.util.Pair; import com.google.devtools.build.lib.vfs.PathFragment; - import java.util.List; /** @@ -55,7 +54,6 @@ final class CompilationAttributes { private final NestedSetBuilder sdkFrameworks = NestedSetBuilder.stableOrder(); private final NestedSetBuilder weakSdkFrameworks = NestedSetBuilder.stableOrder(); private final NestedSetBuilder sdkDylibs = NestedSetBuilder.stableOrder(); - private Optional bridgingHeader = Optional.absent(); private Optional packageFragment = Optional.absent(); private boolean enableModules; @@ -155,18 +153,6 @@ final class CompilationAttributes { return this; } - /** - * Sets the bridging header to be used when compiling Swift sources. - */ - public Builder setBridgingHeader(Artifact bridgingHeader) { - Preconditions.checkState( - !this.bridgingHeader.isPresent(), - "bridgingHeader is already set to %s", - this.bridgingHeader); - this.bridgingHeader = Optional.of(bridgingHeader); - return this; - } - /** * Sets the package path from which to base the header search paths. */ @@ -194,7 +180,6 @@ final class CompilationAttributes { return new CompilationAttributes( this.hdrs.build(), this.textualHdrs.build(), - this.bridgingHeader, this.includes.build(), this.sdkIncludes.build(), this.sdkFrameworks.build(), @@ -220,13 +205,6 @@ final class CompilationAttributes { builder.addTextualHdrs( PrerequisiteArtifacts.nestedSet(ruleContext, "textual_hdrs", Mode.TARGET)); } - - if (ruleContext.attributes().has("bridging_header", BuildType.LABEL)) { - Artifact header = ruleContext.getPrerequisiteArtifact("bridging_header", Mode.TARGET); - if (header != null) { - builder.setBridgingHeader(header); - } - } } private static void addIncludesFromRuleContext(Builder builder, RuleContext ruleContext) { @@ -329,7 +307,6 @@ final class CompilationAttributes { private final NestedSet hdrs; private final NestedSet textualHdrs; - private final Optional bridgingHeader; private final NestedSet includes; private final NestedSet sdkIncludes; private final NestedSet sdkFrameworks; @@ -344,7 +321,6 @@ final class CompilationAttributes { private CompilationAttributes( NestedSet hdrs, NestedSet textualHdrs, - Optional bridgingHeader, NestedSet includes, NestedSet sdkIncludes, NestedSet sdkFrameworks, @@ -357,7 +333,6 @@ final class CompilationAttributes { boolean enableModules) { this.hdrs = hdrs; this.textualHdrs = textualHdrs; - this.bridgingHeader = bridgingHeader; this.includes = includes; this.sdkIncludes = sdkIncludes; this.sdkFrameworks = sdkFrameworks; @@ -384,13 +359,6 @@ final class CompilationAttributes { return this.textualHdrs; } - /** - * Returns the bridging header to be used when compiling Swift sources. - */ - public Optional bridgingHeader() { - return this.bridgingHeader; - } - /** * Returns the include paths to be made available for compilation. */ -- cgit v1.2.3