commit 8967d7562557001eb10e216ba7a947fb6054c67c
author Cole Faust <colefaust@google.com> Wed Feb 19 17:27:29 2025 -0800
committer Cole Faust <colefaust@google.com> Thu Feb 20 10:40:37 2025 -0800
tree 0357b2360e9c439143909c22dd6cee2c44f5e054
parent 4b1a0b83301ff2dfeaa1de93f741a8886ed4ffeb

Remove --sort_entries from soong_zip

We can just always sort the entries and not worry about passing the
flag or not.

Bug: 395160816
Test: Presubmits
Change-Id: Ic1a8b8ef9c74368d1aed77a228c52ccc08b3375f

filesystem/android_device.go

diff --git a/filesystem/android_device.go b/filesystem/android_device.go
index 47c4e3d..6d40103 100644
--- a/filesystem/android_device.go
+++ b/filesystem/android_device.go
@@ -214,7 +214,7 @@
 
 	allImagesZip := android.PathForModuleOut(ctx, "all_images.zip")
 	allImagesZipBuilder := android.NewRuleBuilder(pctx, ctx)
-	cmd := allImagesZipBuilder.Command().BuiltTool("soong_zip").Flag("--sort_entries")
+	cmd := allImagesZipBuilder.Command().BuiltTool("soong_zip")
 	for _, dep := range deps {
 		cmd.FlagWithArg("-e ", dep.Base())
 		cmd.FlagWithInput("-f ", dep)