Automated Code Change

PiperOrigin-RevId: 857854961
Change-Id: Id2d343738e8be18a94fa1103658dbe7f3a968504

Author: cushon

src/tools/java/com/google/devtools/build/android/AarGeneratorAction.java

@@ -40,8 +40,6 @@
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.FileTime;
-import java.time.Instant;
-import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -69,9 +67,6 @@
  * </pre>
  */
 public class AarGeneratorAction {
-  public static final Instant DEFAULT_TIMESTAMP =
-      LocalDateTime.of(2010, 1, 1, 0, 0, 0).atZone(ZoneId.systemDefault()).toInstant();
-
   private static final Logger logger = Logger.getLogger(AarGeneratorAction.class.getName());
 
   /** Flag specifications for this action. */
@@ -217,7 +212,7 @@ static void writeAar(
     try (final ZipOutputStream zipOut =
         new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(aar)))) {
       ZipEntry manifestEntry = new ZipEntry("AndroidManifest.xml");
-      manifestEntry.setTime(DEFAULT_TIMESTAMP.toEpochMilli());
+      manifestEntry.setTimeLocal(JarTime.DEFAULT_TIMESTAMP);
       zipOut.putNextEntry(manifestEntry);
       zipOut.write(Files.readAllBytes(manifest));
       zipOut.closeEntry();
@@ -230,14 +225,14 @@ static void writeAar(
 
         ZipEntry aarMetadataEntry =
             new ZipEntry("META-INF/com/android/build/gradle/aar-metadata.properties");
-        aarMetadataEntry.setTime(DEFAULT_TIMESTAMP.toEpochMilli());
+        aarMetadataEntry.setTimeLocal(JarTime.DEFAULT_TIMESTAMP);
         zipOut.putNextEntry(aarMetadataEntry);
         zipOut.write(Files.readAllBytes(aarMetadata));
         zipOut.closeEntry();
       }
 
       ZipEntry classJar = new ZipEntry("classes.jar");
-      classJar.setTime(DEFAULT_TIMESTAMP.toEpochMilli());
+      classJar.setTimeLocal(JarTime.DEFAULT_TIMESTAMP);
       zipOut.putNextEntry(classJar);
       zipOut.write(Files.readAllBytes(classes));
       zipOut.closeEntry();
@@ -247,14 +242,14 @@ static void writeAar(
       resWriter.writeEntries();
 
       ZipEntry r = new ZipEntry("R.txt");
-      r.setTime(DEFAULT_TIMESTAMP.toEpochMilli());
+      r.setTimeLocal(JarTime.DEFAULT_TIMESTAMP);
       zipOut.putNextEntry(r);
       zipOut.write(Files.readAllBytes(rtxt));
       zipOut.closeEntry();
 
       if (!proguardSpecs.isEmpty()) {
         ZipEntry proguardTxt = new ZipEntry("proguard.txt");
-        proguardTxt.setTime(DEFAULT_TIMESTAMP.toEpochMilli());
+        proguardTxt.setTimeLocal(JarTime.DEFAULT_TIMESTAMP);
         zipOut.putNextEntry(proguardTxt);
         for (Path proguardSpec : proguardSpecs) {
           zipOut.write(Files.readAllBytes(proguardSpec));
@@ -270,7 +265,8 @@ static void writeAar(
         assetWriter.writeEntries();
       }
     }
-    Files.setLastModifiedTime(aar, FileTime.from(DEFAULT_TIMESTAMP));
+    Files.setLastModifiedTime(
+        aar, FileTime.from(JarTime.DEFAULT_TIMESTAMP.atZone(ZoneId.systemDefault()).toInstant()));
   }
 
   private static class ZipDirectoryWriter extends SimpleFileVisitor<Path> {
@@ -310,7 +306,7 @@ void writeEntries() throws IOException {
 
     private void writeFileEntry(Path file) throws IOException {
       ZipEntry entry = new ZipEntry(new File(dirName, root.relativize(file).toString()).toString());
-      entry.setTime(DEFAULT_TIMESTAMP.toEpochMilli());
+      entry.setTimeLocal(JarTime.DEFAULT_TIMESTAMP);
       zipOut.putNextEntry(entry);
       zipOut.write(Files.readAllBytes(file));
       zipOut.closeEntry();
@@ -319,7 +315,7 @@ private void writeFileEntry(Path file) throws IOException {
     private void writeDirectoryEntry(Path dir) throws IOException {
       ZipEntry entry =
           new ZipEntry(new File(dirName, root.relativize(dir).toString()).toString() + "/");
-      entry.setTime(DEFAULT_TIMESTAMP.toEpochMilli());
+      entry.setTimeLocal(JarTime.DEFAULT_TIMESTAMP);
       zipOut.putNextEntry(entry);
       zipOut.closeEntry();
     }

src/tools/java/com/google/devtools/build/android/JarTime.java

@@ -0,0 +1,36 @@
+// Copyright 2015 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.
+
+package com.google.devtools.build.android;
+
+import java.time.LocalDateTime;
+
+/** Jar timestamp normalization. */
+public final class JarTime {
+  /**
+   * Normalize timestamps to 2010-1-1.
+   *
+   * <p>The ZIP format uses MS-DOS timestamps (see <a
+   * href="https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT">APPNOTE.TXT</a>) which use
+   * 1980-1-1 as the epoch. To work around this, {@link ZipEntry} uses portability-reducing ZIP
+   * extensions to store pre-1980 timestamps, which can occasionally <a
+   * href="https://bugs.openjdk.java.net/browse/JDK-8246129>cause</a> <a
+   * href="https://openjdk.markmail.org/thread/wzw7zfilk5j7uzqk>issues</a>. For that reason, using a
+   * fixed post-1980 timestamp is preferred. At Google, the timestamp of 2010-1-1 is used by
+   * convention in deterministic jar archives.
+   */
+  public static final LocalDateTime DEFAULT_TIMESTAMP = LocalDateTime.of(2010, 1, 1, 0, 0, 0);
+
+  private JarTime() {}
+}

src/tools/java/com/google/devtools/build/android/idlclass/IdlClass.java

@@ -24,6 +24,7 @@
 import com.google.common.collect.Sets;
 import com.google.common.hash.Hashing;
 import com.google.devtools.build.android.AndroidOptionsUtils;
+import com.google.devtools.build.android.JarTime;
 import com.google.devtools.build.buildjar.proto.JavaCompilation.CompilationUnit;
 import com.google.devtools.build.buildjar.proto.JavaCompilation.Manifest;
 import java.io.BufferedOutputStream;
@@ -33,8 +34,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.attribute.FileTime;
-import java.time.Instant;
-import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -52,10 +51,6 @@
  * from idl processing.
  */
 public class IdlClass {
-  // Cribbed from AarGeneratorAction.java
-  private static final Instant DEFAULT_TIMESTAMP =
-      LocalDateTime.of(2010, 1, 1, 0, 0, 0).atZone(ZoneId.systemDefault()).toInstant();
-
   public static void main(String[] args) throws IOException {
     IdlClassOptions idlClassOptions = new IdlClassOptions();
     String[] preprocessedArgs = AndroidOptionsUtils.runArgFilePreprocessor(args);
@@ -187,7 +182,7 @@ private static void writeOutputJar(Path outputJar, Path tempDir) throws IOExcept
 
       for (Path path : files) {
         ZipEntry entry = new ZipEntry(tempDir.relativize(path).toString());
-        entry.setTime(DEFAULT_TIMESTAMP.toEpochMilli());
+        entry.setTimeLocal(JarTime.DEFAULT_TIMESTAMP);
         entry.setSize(Files.size(path));
         entry.setCompressedSize(Files.size(path));
         entry.setCrc(Hashing.crc32().hashBytes(Files.readAllBytes(path)).padToLong());
@@ -199,6 +194,8 @@ private static void writeOutputJar(Path outputJar, Path tempDir) throws IOExcept
     } catch (IOException e) {
       throw new IOException("Failed to write output jar: " + outputJar, e);
     }
-    Files.setLastModifiedTime(outputJar, FileTime.from(DEFAULT_TIMESTAMP));
+    Files.setLastModifiedTime(
+        outputJar,
+        FileTime.from(JarTime.DEFAULT_TIMESTAMP.atZone(ZoneId.systemDefault()).toInstant()));
   }
 }

src/tools/javatests/com/google/devtools/build/android/AarGeneratorActionTest.java

@@ -35,6 +35,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.attribute.FileTime;
+import java.time.ZoneId;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -254,7 +255,9 @@ private void writeClassesJar() throws IOException {
 
         zout.close();
 
-        Files.setLastModifiedTime(classes, FileTime.from(AarGeneratorAction.DEFAULT_TIMESTAMP));
+        Files.setLastModifiedTime(
+            classes,
+            FileTime.from(JarTime.DEFAULT_TIMESTAMP.atZone(ZoneId.systemDefault()).toInstant()));
       }
     }
 
@@ -569,9 +572,10 @@ public void testExistentAarMetadataPath() throws Exception {
         aarData.proguardSpecs);
 
     assertThat(getZipEntryTimestamps(aar))
-        .containsExactly(AarGeneratorAction.DEFAULT_TIMESTAMP.toEpochMilli());
+        .containsExactly(
+            JarTime.DEFAULT_TIMESTAMP.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
     assertThat(Files.getLastModifiedTime(aar).toInstant())
-        .isEqualTo(AarGeneratorAction.DEFAULT_TIMESTAMP);
+        .isEqualTo(JarTime.DEFAULT_TIMESTAMP.atZone(ZoneId.systemDefault()).toInstant());
   }
 
   @Test public void testAssetResourceSubdirs() throws Exception {