Fix --build_target= handling after fb056bc

PiperOrigin-RevId: 511591549 Change-Id: I7ad764da4d246b87925d0c07b9b85c95589f13ba
bazelbuild · Feb 22, 2023 · ce71760 · ce71760
1 parent 43dadb2
commit ce71760
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 1 deletion.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BUILD
@@ -62,6 +62,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster",
         "//src/main/java/com/google/devtools/build/lib/analysis:test/test_configuration",
         "//src/main/java/com/google/devtools/build/lib/analysis:transitive_info_collection",
+        "//src/main/java/com/google/devtools/build/lib/cmdline",
         "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
         "//src/main/java/com/google/devtools/build/lib/packages",
         "//src/main/java/com/google/devtools/build/lib/rules/cpp",

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java
@@ -36,6 +36,7 @@
 import com.google.devtools.build.lib.analysis.actions.Template;
 import com.google.devtools.build.lib.analysis.actions.TemplateExpansionAction;
 import com.google.devtools.build.lib.analysis.test.TestConfiguration;
+import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
@@ -573,6 +574,7 @@ public String addCoverageSupport(JavaCompilationHelper helper, Artifact executab
   public CustomCommandLine buildSingleJarCommandLine(
       String toolchainIdentifier,
       Artifact output,
+      Label label,
       String mainClass,
       ImmutableList<String> manifestLines,
       Iterable<Artifact> buildInfoFiles,
@@ -593,6 +595,7 @@ public CustomCommandLine buildSingleJarCommandLine(
       NestedSet<String> addOpens) {
     return DeployArchiveBuilder.defaultSingleJarCommandLineWithoutOneVersion(
             output,
+            label,
             mainClass,
             manifestLines,
             buildInfoFiles,

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/DeployArchiveBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/java/DeployArchiveBuilder.java
@@ -30,6 +30,7 @@
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.actions.CustomCommandLine;
 import com.google.devtools.build.lib.analysis.actions.SpawnAction;
+import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
@@ -239,6 +240,7 @@ public DeployArchiveBuilder setAddOpens(NestedSet<String> addOpens) {
 
   public static CustomCommandLine.Builder defaultSingleJarCommandLineWithoutOneVersion(
       Artifact outputJar,
+      Label label,
       String javaMainClass,
       ImmutableList<String> deployManifestLines,
       Iterable<Artifact> buildInfoFiles,
@@ -255,6 +257,7 @@ public static CustomCommandLine.Builder defaultSingleJarCommandLineWithoutOneVer
       NestedSet<String> addOpens) {
     return defaultSingleJarCommandLine(
         outputJar,
+        label,
         javaMainClass,
         deployManifestLines,
         buildInfoFiles,
@@ -275,6 +278,7 @@ public static CustomCommandLine.Builder defaultSingleJarCommandLineWithoutOneVer
 
   public static CustomCommandLine.Builder defaultSingleJarCommandLine(
       Artifact outputJar,
+      Label label,
       String javaMainClass,
       ImmutableList<String> deployManifestLines,
       Iterable<Artifact> buildInfoFiles,
@@ -294,6 +298,7 @@ public static CustomCommandLine.Builder defaultSingleJarCommandLine(
 
     CustomCommandLine.Builder args = CustomCommandLine.builder();
     args.addExecPath("--output", outputJar);
+    args.add("--build_target", label.getCanonicalForm());
     if (compress == Compression.COMPRESSED) {
       args.add("--compression");
     }
@@ -449,6 +454,7 @@ public void build() throws InterruptedException {
         semantics.buildSingleJarCommandLine(
             toolchainIdentifier,
             outputJar,
+            ruleContext.getLabel(),
             javaStartClass,
             deployManifestLines,
             buildInfoArtifacts,

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
@@ -251,6 +251,7 @@ void checkForProtoLibraryAndJavaProtoLibraryOnSameProto(
   CustomCommandLine buildSingleJarCommandLine(
       String toolchainIdentifier,
       Artifact output,
+      Label label,
       String mainClass,
       ImmutableList<String> manifestLines,
       Iterable<Artifact> buildInfoFiles,

diff --git a/src/main/starlark/builtins_bzl/bazel/java/bazel_java_binary_deploy_jar.bzl b/src/main/starlark/builtins_bzl/bazel/java/bazel_java_binary_deploy_jar.bzl
@@ -42,7 +42,7 @@ def _bazel_deploy_jars_impl(ctx):
         info.coverage_main_class,
         info.strip_as_default,
         info.build_info_files,
-        ctx.attr.binary.label.name,
+        str(ctx.attr.binary.label),
         manifest_lines = info.manifest_lines,
     )
 

diff --git a/src/test/java/com/google/devtools/build/lib/view/java/BUILD b/src/test/java/com/google/devtools/build/lib/view/java/BUILD
@@ -112,6 +112,7 @@ java_test(
     deps = [
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/actions:artifacts",
+        "//src/main/java/com/google/devtools/build/lib/cmdline",
         "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
         "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation",
         "//src/main/java/com/google/devtools/build/lib/vfs",

diff --git a/src/test/java/com/google/devtools/build/lib/view/java/SingleJarCommandLineTest.java b/src/test/java/com/google/devtools/build/lib/view/java/SingleJarCommandLineTest.java
@@ -25,6 +25,7 @@
 import com.google.devtools.build.lib.actions.ArtifactRoot;
 import com.google.devtools.build.lib.actions.CommandLine;
 import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
+import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.rules.java.JavaConfiguration.OneVersionEnforcementLevel;
@@ -47,6 +48,7 @@ public void testIncludeBuildData() throws Exception {
     CommandLine command =
         defaultSingleJarCommandLine(
                 dummy,
+                Label.parseCanonicalUnchecked("//dummy"),
                 null,
                 ImmutableList.<String>of(),
                 ImmutableList.<Artifact>of(),
@@ -76,6 +78,7 @@ public void testExcludeBuildData() throws Exception {
     CommandLine command =
         defaultSingleJarCommandLine(
                 dummy,
+                Label.parseCanonicalUnchecked("//dummy"),
                 null,
                 ImmutableList.<String>of(),
                 ImmutableList.<Artifact>of(),
@@ -105,6 +108,7 @@ public void testIncludeJavaLauncher() throws Exception {
     CommandLine command =
         defaultSingleJarCommandLine(
                 dummy,
+                Label.parseCanonicalUnchecked("//dummy"),
                 null,
                 ImmutableList.<String>of(),
                 ImmutableList.<Artifact>of(),
@@ -133,6 +137,7 @@ public void testIncludeCompression() throws Exception {
     CommandLine command =
         defaultSingleJarCommandLine(
                 dummy,
+                Label.parseCanonicalUnchecked("//dummy"),
                 null,
                 ImmutableList.<String>of(),
                 ImmutableList.<Artifact>of(),
@@ -161,6 +166,7 @@ public void testExcludeCompression() throws Exception {
     CommandLine command =
         defaultSingleJarCommandLine(
                 dummy,
+                Label.parseCanonicalUnchecked("//dummy"),
                 null,
                 ImmutableList.<String>of(),
                 ImmutableList.<Artifact>of(),
@@ -193,6 +199,7 @@ public void testOneVersionArgs() throws Exception {
     CommandLine command =
         defaultSingleJarCommandLine(
                 dummy,
+                Label.parseCanonicalUnchecked("//dummy"),
                 null,
                 ImmutableList.<String>of(),
                 ImmutableList.<Artifact>of(),