diff options
| author | 2024-10-08 00:15:22 +0000 | |
|---|---|---|
| committer | 2024-10-08 00:15:22 +0000 | |
| commit | d224fcab8b898f2cd68b10360a1e3aa17d46ba09 (patch) | |
| tree | c67b34d1698c3688641f5aa287cfad4c32d3010e /fsgen/filesystem_creator.go | |
| parent | a916c24da8fd86952ba6d70f788c696a50832322 (diff) | |
| parent | 9e866c861deac3e7ff938eda23d0c5e9200292d5 (diff) | |
Merge "Fix output file path error in filesystem_creator" into main
Diffstat (limited to 'fsgen/filesystem_creator.go')
| -rw-r--r-- | fsgen/filesystem_creator.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go index eb4f3189d..a9f4256ec 100644 --- a/fsgen/filesystem_creator.go +++ b/fsgen/filesystem_creator.go @@ -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 |