diff options
author | 2018-04-25 23:51:31 -0700 | |
---|---|---|
committer | 2018-04-25 23:53:14 -0700 | |
commit | b425ec5df5c2dfb22dca517183338dc2687371ed (patch) | |
tree | 7ba82aadfe5f852f7dcbed0236e97d13417c4efb | |
parent | 032141d73da0b4f24395155f597e9fa5f6298dc3 (diff) |
Automated rollback of commit 404483d99bca4edc0600e72cacfcc36404fd4653.
RELNOTES: None.
PiperOrigin-RevId: 194353580
3 files changed, 9 insertions, 14 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java index d84045cf28..bd97ed5712 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java @@ -232,7 +232,7 @@ public abstract class CcBinary implements RuleConfiguredTargetFactory { CcCompilationHelper compilationHelper = new CcCompilationHelper( ruleContext, semantics, featureConfiguration, ccToolchain, fdoSupport) - .fromCommon(common, /* additionalCopts= */ImmutableList.of()) + .fromCommon(common) .addSources(common.getSources()) .addDeps(ImmutableList.of(CppHelper.mallocForTarget(ruleContext))) .setFake(fake) diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java index 8357d122b5..7389401859 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java @@ -327,10 +327,8 @@ public final class CcCompilationHelper { } /** Sets fields that overlap for cc_library and cc_binary rules. */ - public CcCompilationHelper fromCommon(CcCommon common, List<String> additionalCopts) { - Preconditions.checkNotNull(additionalCopts); - - setCopts(Iterables.concat(common.getCopts(), additionalCopts)); + public CcCompilationHelper fromCommon(CcCommon common) { + setCopts(common.getCopts()); addDefines(common.getDefines()); addDeps(ruleContext.getPrerequisites("deps", Mode.TARGET)); addLooseIncludeDirs(common.getLooseIncludeDirs()); @@ -532,8 +530,8 @@ public final class CcCompilationHelper { return this; } - public CcCompilationHelper setCopts(Iterable<String> copts) { - this.copts = ImmutableList.copyOf(Preconditions.checkNotNull(copts)); + public CcCompilationHelper setCopts(ImmutableList<String> copts) { + this.copts = Preconditions.checkNotNull(copts); return this; } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java index 3399f0845a..0499950d9a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java @@ -97,12 +97,10 @@ public abstract class CcLibrary implements RuleConfiguredTargetFactory { RuleConfiguredTargetBuilder builder = new RuleConfiguredTargetBuilder(context); LinkTargetType staticLinkType = getStaticLinkType(context); boolean linkStatic = context.attributes().get("linkstatic", Type.BOOLEAN); - init(semantics, context, builder, - /* additionalCopts= */ImmutableList.of(), - staticLinkType, - /* neverLink= */ false, + init(semantics, context, builder, staticLinkType, + /*neverLink =*/ false, linkStatic, - /* addDynamicRuntimeInputArtifactsToRunfiles= */ false); + /*addDynamicRuntimeInputArtifactsToRunfiles =*/ false); return builder.build(); } @@ -110,7 +108,6 @@ public abstract class CcLibrary implements RuleConfiguredTargetFactory { CppSemantics semantics, RuleContext ruleContext, RuleConfiguredTargetBuilder targetBuilder, - ImmutableList<String> additionalCopts, LinkTargetType staticLinkType, boolean neverLink, boolean linkStatic, @@ -143,7 +140,7 @@ public abstract class CcLibrary implements RuleConfiguredTargetFactory { CcCompilationHelper compilationHelper = new CcCompilationHelper( ruleContext, semantics, featureConfiguration, ccToolchain, fdoSupport) - .fromCommon(common, additionalCopts) + .fromCommon(common) .addSources(common.getSources()) .addPublicHeaders(common.getHeaders()) .enableCompileProviders() |