From d6322939f70bda254ed2fdd640796aba7b2af44d Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Wed, 11 Jan 2023 19:37:31 -0800 Subject: [PATCH] Sort canned fs_config lines to facilitate comparison with Bazel-built APEXes Bug: 237037156 Test: mixed builds regression testing Change-Id: Ifc9a7b4231c947fe85e77c56ffeb30a2d53df6c4 --- apex/builder.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apex/builder.go b/apex/builder.go index 3b9cac069..18d0836b6 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -1133,7 +1133,7 @@ func (a *apexBundle) buildCannedFsConfig(ctx android.ModuleContext) android.Outp if a.properties.Canned_fs_config != nil { cmd.Text("cat").Input(android.PathForModuleSrc(ctx, *a.properties.Canned_fs_config)) } - cmd.Text(")").FlagWithOutput("> ", cannedFsConfig) + cmd.Text(") | LC_ALL=C sort ").FlagWithOutput("> ", cannedFsConfig) builder.Build("generateFsConfig", fmt.Sprintf("Generating canned fs config for %s", a.BaseModuleName())) return cannedFsConfig.OutputPath