Add ijar test when original MANIFEST contains target label and sections

third_party/ijar/test/BUILD

@@ -152,6 +152,14 @@ genrule(
     tools = ["//third_party/ijar"],
 )
 
+genrule(
+    name = "jar_with_target_label_and_manifest_sections",
+    srcs = ["jar-with-target-label-and-manifest-sections.jar"],
+    outs = ["jar-with-target-label-and-manifest-sections-nostrip.jar"],
+    cmd = "$(location //third_party/ijar) --target_label //foo:foo --nostrip_jar $< $@",
+    tools = ["//third_party/ijar"],
+)
+
 genrule(
     name = "jar_without_manifest_nostrip_idempotence",
     srcs = ["jar-without-manifest-nostrip.jar"],
@@ -324,6 +332,7 @@ java_test(
         ":jar_with_manifest_and_target_label_nostrip",
         ":jar_with_manifest_nostrip",
         ":jar_with_manifest_sections",
+        ":jar_with_target_label_and_manifest_sections",
         ":jar_without_manifest_nostrip",
         ":jar_without_manifest_nostrip_idempotence",
         ":kotlin_module-interface.jar",

third_party/ijar/test/IjarTests.java

@@ -420,6 +420,27 @@ public void testPreserveManifestSections() throws Exception {
     }
   }
 
+  @Test
+  public void testPreserveManifestSectionsAndUpdateExistingTargetLabel() throws Exception {
+    try (JarFile stripped = new JarFile(
+        "third_party/ijar/test/jar-with-target-label-and-manifest-sections-nostrip.jar")) {
+      ImmutableList<String> strippedEntries =
+          stripped.stream().map(JarEntry::getName).collect(toImmutableList());
+
+      assertThat(strippedEntries.get(0)).isEqualTo("META-INF/");
+      assertThat(strippedEntries.get(1)).isEqualTo("META-INF/MANIFEST.MF");
+      Manifest manifest = stripped.getManifest();
+      Attributes attributes = manifest.getMainAttributes();
+      assertThat(attributes.getValue("Target-Label")).isEqualTo("//foo:foo");
+
+      Attributes sectionAttributes1 = manifest.getAttributes("foo");
+      assertThat(sectionAttributes1.getValue("Foo")).isEqualTo("bar");
+
+      Attributes sectionAttributes2 = manifest.getAttributes("baz");
+      assertThat(sectionAttributes2.getValue("Another")).isEqualTo("bar");
+    }
+  }
+
   // Tests idempotence of --nostrip
   @Test
   public void testNoStripIdempotence() throws Exception {