From 82209cf9556d070fc617f54bb2277b812090b88e Mon Sep 17 00:00:00 2001
From: Vaidas Pilkauskas <vaidasp@wix.com>
Date: Mon, 4 Jan 2021 16:33:42 +0200
Subject: [PATCH 1/5] ijar: fix manifest sections handling

---
 third_party/ijar/ijar.cc             | 20 ++++++++++++++------
 third_party/ijar/test/BUILD          | 10 ++++++++++
 third_party/ijar/test/IjarTests.java | 21 +++++++++++++++++++++
 3 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/third_party/ijar/ijar.cc b/third_party/ijar/ijar.cc
index 1e51291d3e13d3..1d9fe01aa2b958 100644
--- a/third_party/ijar/ijar.cc
+++ b/third_party/ijar/ijar.cc
@@ -298,7 +298,9 @@ u1 *JarCopierProcessor::AppendTargetLabelToManifest(
     const char *target_label, const char *injecting_rule_kind) {
   const char *line_start = (const char *)manifest_data;
   const char *data_end = (const char *)manifest_data + size;
-  while (line_start < data_end) {
+
+  // Write main attributes part
+  while (line_start < data_end && line_start[0] != '\r' && line_start[0] != '\n') {
     const char *line_end = strchr(line_start, '\n');
     // Go past return char to point to next line, or to end of data buffer
     line_end = line_end != nullptr ? line_end + 1 : data_end;
@@ -309,18 +311,24 @@ u1 *JarCopierProcessor::AppendTargetLabelToManifest(
         strncmp(line_start, INJECTING_RULE_KIND_KEY,
                 INJECTING_RULE_KIND_KEY_LENGTH) != 0) {
       size_t len = line_end - line_start;
-      // Skip empty lines
-      if (len > 0 && line_start[0] != '\r' && line_start[0] != '\n') {
-        memcpy(buf, line_start, len);
-        buf += len;
-      }
+      memcpy(buf, line_start, len);
+      buf += len;
     }
     line_start = line_end;
   }
+
+  // Append target label and, if given, rule kind
   buf = WriteManifestAttr(buf, TARGET_LABEL_KEY, target_label);
   if (injecting_rule_kind != nullptr) {
     buf = WriteManifestAttr(buf, INJECTING_RULE_KIND_KEY, injecting_rule_kind);
   }
+
+  // Write the rest of the manifest file
+  size_t sections_len = data_end - line_start;
+  if (sections_len > 0) {
+    memcpy(buf, line_start, sections_len);
+    buf += sections_len;
+  }
   return buf;
 }
 
diff --git a/third_party/ijar/test/BUILD b/third_party/ijar/test/BUILD
index daf0f16a78bbcf..3061fecc001e91 100644
--- a/third_party/ijar/test/BUILD
+++ b/third_party/ijar/test/BUILD
@@ -144,6 +144,14 @@ genrule(
     tools = ["//third_party/ijar"],
 )
 
+genrule(
+    name = "jar_with_manifest_sections",
+    srcs = ["jar-with-manifest-sections.jar"],
+    outs = ["jar-with-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"],
@@ -305,6 +313,7 @@ java_test(
         "UseRestrictedAnnotation.java",
         "jar-with-manifest.jar",
         "jar-with-manifest-and-target-label.jar",
+        "jar-with-manifest-sections.jar",
         "jar-without-manifest.jar",
         "package-info.java",
         ":empty_with_target_label",
@@ -314,6 +323,7 @@ java_test(
         ":interface_ijar_testlib_with_target_label",
         ":jar_with_manifest_and_target_label_nostrip",
         ":jar_with_manifest_nostrip",
+        ":jar_with_manifest_sections",
         ":jar_without_manifest_nostrip",
         ":jar_without_manifest_nostrip_idempotence",
         ":kotlin_module-interface.jar",
diff --git a/third_party/ijar/test/IjarTests.java b/third_party/ijar/test/IjarTests.java
index 7563f599ca39c0..ecad9c3c712f57 100644
--- a/third_party/ijar/test/IjarTests.java
+++ b/third_party/ijar/test/IjarTests.java
@@ -399,6 +399,27 @@ public void testNoStripJarWithoutManifest() throws Exception {
     }
   }
 
+  @Test
+  public void testPreserveManifestSections() throws Exception {
+    try (JarFile stripped = new JarFile(
+        "third_party/ijar/test/jar-with-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 {

From b5f0f25a7ca352788d08ebde54ad6aac2e18370e Mon Sep 17 00:00:00 2001
From: Vaidas Pilkauskas <vaidasp@wix.com>
Date: Mon, 4 Jan 2021 17:38:33 +0200
Subject: [PATCH 2/5] ijar: fix manifest sections handling - add test jar

---
 .../ijar/test/jar-with-manifest-sections.jar     | Bin 0 -> 3348 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 third_party/ijar/test/jar-with-manifest-sections.jar

diff --git a/third_party/ijar/test/jar-with-manifest-sections.jar b/third_party/ijar/test/jar-with-manifest-sections.jar
new file mode 100644
index 0000000000000000000000000000000000000000..4c652f32c1d84e2f80da5448d45c54a17e68086d
GIT binary patch
literal 3348
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
Heg^*sjuYDl

literal 0
HcmV?d00001


From e0fcc827593c4dbaba64af80025d069799e23bb2 Mon Sep 17 00:00:00 2001
From: Vaidas Pilkauskas <vaidasp@wix.com>
Date: Fri, 29 Jan 2021 10:25:14 +0200
Subject: [PATCH 3/5] Add ijar test when original MANIFEST contains target
 label and sections

---
 third_party/ijar/test/BUILD                   |   9 ++++++++
 third_party/ijar/test/IjarTests.java          |  21 ++++++++++++++++++
 ...ith-target-label-and-manifest-sections.jar | Bin 0 -> 3371 bytes
 3 files changed, 30 insertions(+)
 create mode 100644 third_party/ijar/test/jar-with-target-label-and-manifest-sections.jar

diff --git a/third_party/ijar/test/BUILD b/third_party/ijar/test/BUILD
index 3061fecc001e91..81eae07c8df67b 100644
--- a/third_party/ijar/test/BUILD
+++ b/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",
diff --git a/third_party/ijar/test/IjarTests.java b/third_party/ijar/test/IjarTests.java
index ecad9c3c712f57..fb42c337d27335 100644
--- a/third_party/ijar/test/IjarTests.java
+++ b/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 {
diff --git a/third_party/ijar/test/jar-with-target-label-and-manifest-sections.jar b/third_party/ijar/test/jar-with-target-label-and-manifest-sections.jar
new file mode 100644
index 0000000000000000000000000000000000000000..007949fc268b72676bd8c527041a81af71cf8e6b
GIT binary patch
literal 3371
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
W3-M>2PtUMb!%V=tRdI4(!T$^O*W{o8

literal 0
HcmV?d00001


From e5f9ecde0cde15ffad240a6ab3b3235afe762f95 Mon Sep 17 00:00:00 2001
From: Vaidas Pilkauskas <vaidasp@wix.com>
Date: Fri, 29 Jan 2021 10:38:14 +0200
Subject: [PATCH 4/5] Add assertion on non manifest files

---
 third_party/ijar/test/IjarTests.java | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/third_party/ijar/test/IjarTests.java b/third_party/ijar/test/IjarTests.java
index fb42c337d27335..2e9561049feb6c 100644
--- a/third_party/ijar/test/IjarTests.java
+++ b/third_party/ijar/test/IjarTests.java
@@ -401,8 +401,10 @@ public void testNoStripJarWithoutManifest() throws Exception {
 
   @Test
   public void testPreserveManifestSections() throws Exception {
-    try (JarFile stripped = new JarFile(
-        "third_party/ijar/test/jar-with-manifest-sections-nostrip.jar")) {
+    try (JarFile original = new JarFile(
+        "third_party/ijar/test/jar-with-target-label-and-manifest-sections-nostrip.jar");
+        JarFile stripped = new JarFile(
+            "third_party/ijar/test/jar-with-manifest-sections-nostrip.jar")) {
       ImmutableList<String> strippedEntries =
           stripped.stream().map(JarEntry::getName).collect(toImmutableList());
 
@@ -411,6 +413,7 @@ public void testPreserveManifestSections() throws Exception {
       Manifest manifest = stripped.getManifest();
       Attributes attributes = manifest.getMainAttributes();
       assertThat(attributes.getValue("Target-Label")).isEqualTo("//foo:foo");
+      assertNonManifestFilesBitIdentical(original, stripped);
 
       Attributes sectionAttributes1 = manifest.getAttributes("foo");
       assertThat(sectionAttributes1.getValue("Foo")).isEqualTo("bar");
@@ -422,8 +425,11 @@ 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")) {
+    try (JarFile original = new JarFile(
+        "third_party/ijar/test/jar-with-target-label-and-manifest-sections-nostrip.jar");
+        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());
 
@@ -432,6 +438,7 @@ public void testPreserveManifestSectionsAndUpdateExistingTargetLabel() throws Ex
       Manifest manifest = stripped.getManifest();
       Attributes attributes = manifest.getMainAttributes();
       assertThat(attributes.getValue("Target-Label")).isEqualTo("//foo:foo");
+      assertNonManifestFilesBitIdentical(original, stripped);
 
       Attributes sectionAttributes1 = manifest.getAttributes("foo");
       assertThat(sectionAttributes1.getValue("Foo")).isEqualTo("bar");

From 67edb6a9ac1081faf5f817cd9304dfff02efaff5 Mon Sep 17 00:00:00 2001
From: Vaidas Pilkauskas <vaidasp@wix.com>
Date: Fri, 29 Jan 2021 21:43:16 +0200
Subject: [PATCH 5/5] Generate test input jars with manifest sections

---
 third_party/ijar/test/BUILD                   |  38 +++++++++--
 .../ijar/test/GenJarWithManifestSections.java |  61 ++++++++++++++++++
 .../ijar/test/jar-with-manifest-sections.jar  | Bin 3348 -> 0 bytes
 ...ith-target-label-and-manifest-sections.jar | Bin 3371 -> 0 bytes
 4 files changed, 93 insertions(+), 6 deletions(-)
 create mode 100644 third_party/ijar/test/GenJarWithManifestSections.java
 delete mode 100644 third_party/ijar/test/jar-with-manifest-sections.jar
 delete mode 100644 third_party/ijar/test/jar-with-target-label-and-manifest-sections.jar

diff --git a/third_party/ijar/test/BUILD b/third_party/ijar/test/BUILD
index 81eae07c8df67b..2621c9b7cbf688 100644
--- a/third_party/ijar/test/BUILD
+++ b/third_party/ijar/test/BUILD
@@ -145,19 +145,21 @@ genrule(
 )
 
 genrule(
-    name = "jar_with_manifest_sections",
-    srcs = ["jar-with-manifest-sections.jar"],
+    name = "jar_with_manifest_sections_nostrip",
+    srcs = [":jar_with_manifest_sections"],
     outs = ["jar-with-manifest-sections-nostrip.jar"],
     cmd = "$(location //third_party/ijar) --target_label //foo:foo --nostrip_jar $< $@",
     tools = ["//third_party/ijar"],
+    testonly = 1,
 )
 
 genrule(
-    name = "jar_with_target_label_and_manifest_sections",
-    srcs = ["jar-with-target-label-and-manifest-sections.jar"],
+    name = "jar_with_target_label_and_manifest_sections_nostrip",
+    srcs = [":jar_with_target_label_and_manifest_sections"],
     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"],
+    testonly = 1,
 )
 
 genrule(
@@ -308,6 +310,30 @@ genrule(
     tools = ["//third_party/ijar"],
 )
 
+java_binary(
+    name = "GenJarWithManifestSections",
+    main_class = "GenJarWithManifestSections",
+    srcs = ["GenJarWithManifestSections.java"],
+    deps = ["//third_party:guava"],
+    testonly = 1,
+)
+
+genrule(
+    name = "jar_with_manifest_sections",
+    outs = ["jar-with-manifest-sections.jar"],
+    cmd = "$(location :GenJarWithManifestSections) $@",
+    testonly = 1,
+    tools = [":GenJarWithManifestSections"],
+)
+
+genrule(
+    name = "jar_with_target_label_and_manifest_sections",
+    outs = ["jar-with-target-label-and-manifest-sections.jar"],
+    cmd = "$(location :GenJarWithManifestSections) $@ //not:this",
+    testonly = 1,
+    tools = [":GenJarWithManifestSections"],
+)
+
 java_test(
     name = "IjarTests",
     size = "small",
@@ -331,8 +357,8 @@ java_test(
         ":interface_ijar_testlib_with_target_label",
         ":jar_with_manifest_and_target_label_nostrip",
         ":jar_with_manifest_nostrip",
-        ":jar_with_manifest_sections",
-        ":jar_with_target_label_and_manifest_sections",
+        ":jar_with_manifest_sections_nostrip",
+        ":jar_with_target_label_and_manifest_sections_nostrip",
         ":jar_without_manifest_nostrip",
         ":jar_without_manifest_nostrip_idempotence",
         ":kotlin_module-interface.jar",
diff --git a/third_party/ijar/test/GenJarWithManifestSections.java b/third_party/ijar/test/GenJarWithManifestSections.java
new file mode 100644
index 00000000000000..276f82dda0dc40
--- /dev/null
+++ b/third_party/ijar/test/GenJarWithManifestSections.java
@@ -0,0 +1,61 @@
+// Copyright 2021 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import com.google.common.io.ByteStreams;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Map;
+import java.util.jar.Attributes;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+import java.util.zip.ZipEntry;
+
+public class GenJarWithManifestSections {
+
+  public static void main(String[] args) throws IOException {
+    try (JarOutputStream jos = new JarOutputStream(Files.newOutputStream(Paths.get(args[0])))) {
+      addEntry(jos, "META-INF/MANIFEST.MF");
+      Manifest manifest = new Manifest();
+      Attributes mainAttributes = manifest.getMainAttributes();
+      mainAttributes.put(Attributes.Name.MANIFEST_VERSION, "1.0");
+
+      if (args.length > 1) {
+        String targetLabel = args[1];
+        mainAttributes.put(new Attributes.Name("Target-Label"), targetLabel);
+      }
+
+      Map<String, Attributes> entries = manifest.getEntries();
+
+      Attributes foo = new Attributes();
+      foo.put(new Attributes.Name("Foo"), "bar");
+      entries.put("foo", foo);
+
+      Attributes baz = new Attributes();
+      baz.put(new Attributes.Name("Another"), "bar");
+      entries.put("baz", baz);
+
+      manifest.write(jos);
+
+      addEntry(jos, "java/lang/String.class");
+      ByteStreams.copy(String.class.getResourceAsStream("/java/lang/String.class"), jos);
+    }
+  }
+
+  private static void addEntry(JarOutputStream jos, String name) throws IOException {
+    ZipEntry ze = new ZipEntry(name);
+    ze.setTime(0);
+    jos.putNextEntry(ze);
+  }
+}
diff --git a/third_party/ijar/test/jar-with-manifest-sections.jar b/third_party/ijar/test/jar-with-manifest-sections.jar
deleted file mode 100644
index 4c652f32c1d84e2f80da5448d45c54a17e68086d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3348
zcma)9c|4SD7aqo*ELpP;84P1=F<E}bmc}$_hF)1J%U~>nF-n${WwMo>WckWgLnz6T
zk~K?~kI0fl67Q>Idx?_wk?$*7-g=(jx$l3T-*xW$oa>x(J?0oN11|^!VgU@I{eG21
z%cKW^oEbqNUXTb#k3{mK*i#5j1|IglzKV{UtEB}i2yA{{2V=wjz}nA$7l@9*=PVe+
zfImS83dRrNc=UL6vOK9u`XVSNZaN6{76YFEg8(YQmDfZ;ET{+F8(#p`p`kCpbTQ(g
z`IcwTi4)FfvBuY-uzoM9pH;hWtgp;)o|As{vWl9H?7iGSka>O;DQTsY&_n5I(!stv
zJx-VU(m&FeNle(kf$O=z2wY{b+F+`+t?H6?>l@gK)-XQmwYdE>!}NDig{?I~SQE1Y
zCjMn^V{!&&*RRyKo3yR(9-tjPlVYzn@LIW_cz9Y0jy@{JIF_XM@;+Uo71t|Tc927n
zKHJ}!kjyJXj*%YzM&y}J);8U~_A|2~WFge4E_vi^_QbBv%5ZMWJ;|qE?qflyyFsjK
zaF1(pZWT!hjQUzG+;9QYVz5v2a`{?Lw;S4thRt2!(6VmlTajyWa?vog^z2u*y@421
zsGaHmNdJQOUU+R+p8zG4pQ_|>vcEx9yK;^mv6rdarS>=vDdEHLsf)u^&2|IAmA5YK
zW>U8w=Q}PuSU$&O!&JsU>JX}aRaGb@fT<=+_Z1^yOtf)sG7x1$?l;up%7{`CG`?gr
z@$3V8+cK*fxTJ%@liV@6fJzZ^PsrE1UKU`kd>uEQ2t6RK*0w9>Xbel2#VA^3omO}5
zEit4BW;(;Q>=vC`K!o4#;7Es&$4t{j*65oo+>CrnoTf?cJpA@OVa$SAVoQ?Y4C~F2
z?_@OpyY>*RW+;vow~ysYgV2_v3gYT(HTrVlj`8*Id&LEGkGwOc3AgM7TNr$V$_>XL
zIlin?>pa&q8%~5sEv!CP&N+3HLkioX{%2vX{0ew}Nb_E|!%Dn{H#2^z)8Sr1<3*?#
zl%^IxvM(56l---&Gf^#ho2bd;E|(}1`_$08l3UG><|Qtgp-|$u_f&75TB`D8wGFWO
z4yGTQUE-9X1A#^W<NnHYq8I5mXzmw}!8D?HBf8(p2j_9l6fvbq-`F+NkR^FYPnK66
z_S|gZDn60bsemygRlYt#w@zGoG|xzCT4A<&B{R-`HYlj}0T>zahcUMeM}_Dc<e>Bt
z$xu>~NN|8^2G#ayRx}h^@r)!qRoP2z5G0B$u@paxsDLHn34IF59Lp?OcQtw+r(kYm
z$``+3yyowXluoA3gKOU2?p+Ar?sOs}R7$iifw@hMa(d5rroKs134i^5O73;6`NJ3i
zv_z>zJB2(nZ>tay!(^*3HKm#Y4Ktr^sdrLOJ1@QDi`v-ee4xD?=+f{>e0*gAsdqjE
zsnaC-F#2xWlXEFnkBv*O3Xs@beTto&IXz2e*-*^F$3{E<f~uZtNlW#Ieb|q@Y56c(
z$o+ZgS-PDOKk0*#`3vYW!9c`eJ0rf&+@5UjNuUtOzGftkGym&4KrVjWar{i{O&U>L
z!B4CQ@+@;@bRs44jeX}|%N=64mM_hO$gUvB+NcW;J?C9>7yAg(H5sw>;P4yktPAvV
z9$o345;(_f%NEPf#kfcRqqWAV=57;JNLwuJ!BV06>{+SGL~lE_M@7*ulJS^MQSi9)
zZ~zY8shJX@Z*5ZJym3g-BcIeTRMS{%>)ZS&t%j51wQB<3kOE>+e=JmKHb@AOm%<lV
zK_V@YO1Vltr5!{(x)t2pdw|0}DVVxSZj?8x(h)2QbR0x0L%0Iyg3J3`j!f&Ydy6>l
z@#pql;BYXE^x+>AeA~r!J!x8CXEgVWUEqcTk?aFZ@|$Sl{74j{Cjm`5Mf4>)co2Ra
zMbEfrCSYYQ>c(K>vXf0WTeL*)<K;(Mr7!O_NBH3@Zc7|bE)OpwWSE?`nd`qlM;9dP
z6Y8)_T`8osBQ1SZ_u;56Xk@IfzBWvXxrIIDQ&6?w3@Ou<3e|AVrYU4+l<Qc^H+%EL
zvHaaj5~dSJax_5Hm^zg#!*sOqI-e#E4%Mt7$lkOl%d7a~*#Sh4s;A28av>{ePKh@W
zb0XYeb!1Vnu!QA<N&q=O^2V`&mC!(HfP}3WJG1t}svXK|z9)$@6gDXqht$!|S*(Z%
z<Do8IOeqcNeDD0X;{}Bcv;H8*r3S3U6*uybEdp^6uhS){Sh;qLGv~QRK?R5^8ZGjs
z4PtgLj6RxDDfiAi`S_S?@{!xPySO`L?)jvA`}`<_H9RESo|Cz_S7T=)O3O7lFhCNN
zfw3v^<3t?&-84j)+hOQ|@i{TDmNI-==!oI_%ZLYtW=X~6w`SWl*?Pims<gIi3eUpc
z4+KmzFXiTFA&3w)C70Qb11lq1D~mJh;5yN+-6FzBRdW~F<=jaJNi99uy>7NN+4&?1
z-2B^)6RYfgUbMuMiWl@mVhyULPga%PE#O;o8(s*BOqJoGQI_iB?N-MVGcz_01s)MR
z{51KbKiJsHE@|B1bo876K0SURK*NhlHqCZehoUVeFHNv1Dh%w6N)sDO9WHqyFnSek
z8@D!NRj}S<e*3w4rLn>6v5!5_V<qm<E@_wb;{r1kp)}Ru22|L!+xsIkUPwvadB{n?
z$W^;uI4gp=V&nOwN-Mh!-QZolh{%xaTRGYct&7jeq8=wYvEW-Jji+>sn0(Ge(MQYv
zImbse+#4ta6DkyP6I$Lc;)-mN%NIa*dxs}Ee-hqI5*yHMHXn%g*1ol}0!hLeS?Iyh
zrUwyU#LS-W#mv_{zp>tjqyFa^1P36T1Z-0peSyI0nW7IG;Vl%g2S205jxL-?0BlPd
zO@l!ohRtOW+wu4?2Cmq%8v}=Rb#&jsDfOw2O_CK&unK5wk6&RqPL>WWGj%<0fjm!M
zm401dEtfYrwMed>oU)PIC(REDPuf%DUoEn@fKkE4T*ZODUa{(U@ZqMHy+%C1**1+G
zI3I=JPjMy!#ZU34d_EUDaKj%+HoTW7L1Ob`2}dsyg+QYCvYBJ(=*7T4Q-y+ngRLj;
z{O0~+jmWsA5x>!g-y-jv!rPJm0?O&@9QZPme-C!&sM!u{%di9XmxJf`{OxSU+x-;+
zLVDXZ_Wi6i|DK<ny=J=~RpuZ1`KI&yo0p#z%m2M_f!^v30)Gi#cyDR(Z*W`e`Mz+r
z;DCM!$~!O2x(#ke83D+fW%Nx6ZLw$Tpx;w|J8}(xyt4oR#LWWuj*pB?n;d2V-c82w
Heg^*sjuYDl

diff --git a/third_party/ijar/test/jar-with-target-label-and-manifest-sections.jar b/third_party/ijar/test/jar-with-target-label-and-manifest-sections.jar
deleted file mode 100644
index 007949fc268b72676bd8c527041a81af71cf8e6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3371
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
W3-M>2PtUMb!%V=tRdI4(!T$^O*W{o8