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

Commit 67e2f79e authored by Maciej Żenczykowski's avatar Maciej Żenczykowski
Browse files

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



This reverts commit d6322939.

Reason for revert: breaks custom canned_fs_config

Bug: 275209284
Signed-off-by: default avatarMaciej Żenczykowski <maze@google.com>
Change-Id: I70756af42cbfbc8a1e80894f1bdaa9f4c5cba9e8
parent d6322939

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(") | 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