Merge "Sort canned fs_config lines to facilitate comparison with Bazel-built APEXes" (7438462e) · Commits · e / os / android_build_soong

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