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

Commit 9e866c86 authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Fix output file path error in filesystem_creator 

Also fixes the arguments passed to invoke file_list_diff

Test: m soong_generated_filesystem_tests
Bug: 371351099
Change-Id: Ie57ecf9ac597c4ea1fcb73e64aaf4571212723c5
parent 45416899

fsgen/filesystem_creator.go

+4 −4
Original line number Diff line number Diff line
@@ -161,16 +161,16 @@ func (f *filesystemCreator) createDiffTest(ctx android.ModuleContext, partitionT 
	makeFileList := android.PathForArbitraryOutput(ctx, fmt.Sprintf("target/product/%s/obj/PACKAGING/%s_intermediates/file_list.txt", ctx.Config().DeviceName(), partitionType))

	// For now, don't allowlist anything. The test will fail, but that's fine in the current

	// early stages where we're just figuring out what we need

	emptyAllowlistFile := android.PathForModuleOut(ctx, "allowlist_%s.txt", partitionModuleName)

	emptyAllowlistFile := android.PathForModuleOut(ctx, fmt.Sprintf("allowlist_%s.txt", partitionModuleName))

	android.WriteFileRule(ctx, emptyAllowlistFile, "")

	diffTestResultFile := android.PathForModuleOut(ctx, "diff_test_%s.txt", partitionModuleName)

	diffTestResultFile := android.PathForModuleOut(ctx, fmt.Sprintf("diff_test_%s.txt", partitionModuleName))



	builder := android.NewRuleBuilder(pctx, ctx)

	builder.Command().BuiltTool("file_list_diff").

		Input(makeFileList).

		Input(filesystemInfo.FileListFile).

		Input(emptyAllowlistFile).

		Text(partitionModuleName)

		Text(partitionModuleName).

		FlagWithInput("--allowlists ", emptyAllowlistFile)

	builder.Command().Text("touch").Output(diffTestResultFile)

	builder.Build(partitionModuleName+" diff test", partitionModuleName+" diff test")

	return diffTestResultFile