Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6322939 authored by Sasha Smundak's avatar Sasha Smundak
Browse files

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

Bug: 237037156
Test: mixed builds regression testing
Change-Id: Ifc9a7b4231c947fe85e77c56ffeb30a2d53df6c4
parent b83b7b02

apex/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -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