diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
12 files changed, 38 insertions, 31 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java index 650027ffd8..3f246766a0 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java @@ -257,10 +257,10 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { androidSemantics, resourceApk, ruleContext.getConfiguration().isCodeCoverageEnabled(), - true /* collectJavaCompilationArgs */, - true, /* isBinary */ + /* collectJavaCompilationArgs= */ true, + /* isBinary= */ true, excludedRuntimeArtifacts, - true /* generateExtensionRegistry */); + /* generateExtensionRegistry= */ true); ruleContext.assertNoErrors(); Function<Artifact, Artifact> derivedJarFunction = @@ -558,13 +558,12 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { androidCommon.addTransitiveInfoProviders( builder, - null /* aar */, + /* aar= */ null, resourceApk, zipAlignedApk, apksUnderTest, nativeLibs, - androidCommon.isNeverLink() - ); + androidCommon.isNeverLink()); if (dexPostprocessingOutput.proguardMap() != null) { builder.addProvider( diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java index f94a3811ae..fffda808d9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java @@ -195,11 +195,11 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory { javaSemantics, androidSemantics, resourceApk, - false /* addCoverageSupport */, - true /* collectJavaCompilationArgs */, - false /* isBinary */, - null /* excludedRuntimeArtifacts */, - false /* generateExtensionRegistry */); + /* addCoverageSupport= */ false, + /* collectJavaCompilationArgs= */ true, + /* isBinary= */ false, + /* excludedRuntimeArtifacts= */ null, + /* generateExtensionRegistry= */ false); if (javaTargetAttributes == null) { return null; } diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java index 76d5ff660e..f5527ba934 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java @@ -102,7 +102,7 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor } else { // Create the final merged manifest ResourceDependencies resourceDependencies = - ResourceDependencies.fromRuleDeps(ruleContext, false /* neverlink */); + ResourceDependencies.fromRuleDeps(ruleContext, /* neverlink= */ false); ApplicationManifest applicationManifest = getApplicationManifest(ruleContext, androidSemantics, resourceDependencies); @@ -119,8 +119,8 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor ImmutableList.of(), /* list of uncompressed extensions */ false, /* crunch png */ ProguardHelper.getProguardConfigArtifact(ruleContext, ""), - null, /* mainDexProguardCfg */ - false, /* conditionalKeepRules */ + /* mainDexProguardCfg= */ null, + /* conditionalKeepRules= */ false, ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_PROCESSED_MANIFEST), ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_RESOURCES_ZIP), DataBinding.isEnabled(ruleContext) @@ -168,7 +168,7 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor propertiesFile, template, substitutions, - false /* makeExecutable */)); + /* makeExecutable= */ false)); // Add the properties file to the test jar as a java resource attributesBuilder.addResource( PathFragment.create("com/android/tools/test_config.properties"), propertiesFile); diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java index adff649444..41d27443a2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java @@ -108,7 +108,7 @@ public class ManifestMergerActionBuilder { builder.add( "--mergeeManifests", mapToDictionaryString( - mergeeManifests, Artifact::getExecPathString, null /* valueConverter */)); + mergeeManifests, Artifact::getExecPathString, /* valueConverter= */ null)); inputs.addAll(mergeeManifests.keySet()); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java index 19bd3a7ddd..6662968cb3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java @@ -1065,7 +1065,8 @@ public class CppLinkActionBuilder { } else { List<String> opts = new ArrayList<>(linkopts); opts.addAll( - featureConfiguration.getCommandLine("lto-indexing", buildVariables, null /* expander */)); + featureConfiguration.getCommandLine( + "lto-indexing", buildVariables, /* expander= */ null)); opts.addAll(cppConfiguration.getLtoIndexOptions()); linkoptsForVariables = ImmutableList.copyOf(opts); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java index 2abecee223..b1b466e2ec 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java @@ -347,7 +347,7 @@ public abstract class CcProtoAspect extends NativeAspectClass implements Configu ruleContext.getLabel(), outputs, "C++", - true /* allowServices */); + /* allowServices= */ true); } private ProtoLangToolchainProvider getProtoToolchainProvider() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java index b3b8ed1bf8..f50bc03944 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java @@ -147,9 +147,15 @@ public class JavaBinary implements RuleConfiguredTargetFactory { Artifact unstrippedLauncher = null; if (stripAsDefault) { unstrippedDeployArchiveBuilder = new DeployArchiveBuilder(semantics, ruleContext); - unstrippedLauncher = semantics.getLauncher(ruleContext, common, - unstrippedDeployArchiveBuilder, runfilesBuilder, jvmFlags, attributesBuilder, - false /* shouldStrip */); + unstrippedLauncher = + semantics.getLauncher( + ruleContext, + common, + unstrippedDeployArchiveBuilder, + runfilesBuilder, + jvmFlags, + attributesBuilder, + /* shouldStrip= */ false); } JavaCompilationArtifacts.Builder javaArtifactsBuilder = new JavaCompilationArtifacts.Builder(); diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java index b60cb2c30e..71c198d73c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java @@ -217,8 +217,8 @@ public final class JavaCompileAction extends SpawnAction { progressMessage, runfilesSupplier, "Javac", - false /*executeUnconditionally*/, - null /*extraActionInfoSupplier*/); + /* executeUnconditionally= */ false, + /* extraActionInfoSupplier= */ null); this.javaCompileCommandLine = javaCompileCommandLine; this.commandLine = commandLine; diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java index 31f7d9e84a..f531e0f700 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java @@ -240,7 +240,8 @@ public class JavaLiteProtoAspect extends NativeAspectClass implements Configured ruleContext, ImmutableList.of( new ProtoCompileActionBuilder.ToolchainInvocation( - "javalite", aspectCommon.getProtoToolchainProvider(), + "javalite", + aspectCommon.getProtoToolchainProvider(), sourceJar.getExecPathString())), supportData.getDirectProtoSources(), supportData.getTransitiveImports(), @@ -249,7 +250,7 @@ public class JavaLiteProtoAspect extends NativeAspectClass implements Configured ruleContext.getLabel(), ImmutableList.of(sourceJar), "JavaLite", - true /* allowServices */); + /* allowServices= */ true); } } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoSkylarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoSkylarkCommon.java index e74d5a005f..6ec3fcfd0a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoSkylarkCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoSkylarkCommon.java @@ -88,7 +88,7 @@ public class JavaProtoSkylarkCommon { skylarkRuleContext.getLabel(), ImmutableList.of(sourceJar), "JavaLite", - true /* allowServices */); + /* allowServices= */ true); } @SkylarkCallable( diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java index 384384250a..e3687be773 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java @@ -51,7 +51,7 @@ public class BazelProtoLibrary implements RuleConfiguredTargetFactory { final SupportData supportData = SupportData.create( - Predicates.<TransitiveInfoCollection>alwaysTrue() /* nonWeakDepsPredicate */, + /* nonWeakDepsPredicate= */ Predicates.<TransitiveInfoCollection>alwaysTrue(), protoSources, protosInDirectDeps, transitiveImports, @@ -73,7 +73,7 @@ public class BazelProtoLibrary implements RuleConfiguredTargetFactory { transitiveImports, protosInDirectDeps, descriptorSetOutput, - true /* allowServices */, + /* allowServices= */ true, dependenciesDescriptorSets, protoPathFlags); diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java index 7eb1e2e324..808c2a309a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java @@ -369,9 +369,9 @@ public class ProtoCompileActionBuilder { // A rule that concatenates the artifacts from ctx.deps.proto.transitive_descriptor_sets // provides similar results. "--descriptor_set_out=$(OUT)", - null /* pluginExecutable */, - null /* runtime */, - NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* blacklistedProtos */), + /* pluginExecutable= */ null, + /* runtime= */ null, + /* blacklistedProtos= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER)), outReplacement); } |