commit 2c25f73880ed72dddb4bfa843388b15f02011158
author Nick Korostelev <nickkor@gmail.com> Tue Mar 15 11:09:24 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Mar 15 11:10:35 2022 -0700
tree b8fa97fb73da6447ce4bda5e0f3ded77d6aad7fb
parent d6089e69c4ebabc3bbcae66f46c5bd0fc125faac

Sort resources to produce consistent zip and help cache hit

Start sorting resources prior to zipping them in order to guarantee consistent shasum on the `Symbols.zip` file which in turn will improve cache hit for action that use these files as inputs.

Requires a new version of Android Tools.

Closes #14377.

PiperOrigin-RevId: 434802238

src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java

diff --git a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java
index 1e1ccf9..38831a2 100644
--- a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java
+++ b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java
@@ -426,7 +426,7 @@
       generated.addAll(compiled.build());
       if (compilationErrors.isEmpty()) {
         // ensure that the generated files are before the normal files.
-        return generated.build();
+        return ImmutableList.sortedCopyOf(generated.build());
       }
       throw CompileError.of(compilationErrors);
     }