commit 67e2f79eb3980a5c8b94705bb04e660e712a380f
author Maciej Żenczykowski <maze@google.com> Mon Mar 27 07:03:43 2023 +0000
committer Maciej Żenczykowski <maze@google.com> Mon Mar 27 07:04:16 2023 +0000
tree 8217d67083d9116e80266cffda2e40ab755de833
parent d6322939f70bda254ed2fdd640796aba7b2af44d

Revert "Sort canned fs_config lines to facilitate comparison with Bazel-built APEXes"

This reverts commit d6322939f70bda254ed2fdd640796aba7b2af44d.

Reason for revert: breaks custom canned_fs_config

Bug: 275209284
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I70756af42cbfbc8a1e80894f1bdaa9f4c5cba9e8

apex/builder.go

diff --git a/apex/builder.go b/apex/builder.go
index 18d0836..3b9cac0 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -1133,7 +1133,7 @@
 	if a.properties.Canned_fs_config != nil {
 		cmd.Text("cat").Input(android.PathForModuleSrc(ctx, *a.properties.Canned_fs_config))
 	}
-	cmd.Text(") | LC_ALL=C sort ").FlagWithOutput("> ", cannedFsConfig)
+	cmd.Text(")").FlagWithOutput("> ", cannedFsConfig)
 	builder.Build("generateFsConfig", fmt.Sprintf("Generating canned fs config for %s", a.BaseModuleName()))
 
 	return cannedFsConfig.OutputPath