Merge "Fix output file path error in filesystem_creator" into main

	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