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

Commit 56301576 authored by Cole Faust's avatar Cole Faust
Browse files

Remove --allowlists 

We were always passing an empty file, clean up the code slightly
by not passing an allowlist at all.

Test: m soong_generated_product_filesystem_test
Change-Id: I9c3ae166d91249cfba83d64a61f0e5f777a57b0e
parent 81f663e4

fsgen/filesystem_creator.go

+1 −6
Original line number Diff line number Diff line
@@ -416,18 +416,13 @@ func (f *filesystemCreator) createDiffTest(ctx android.ModuleContext, partitionT 
		ctx.ModuleErrorf("Expected module %s to provide FileysystemInfo", partitionModuleName)

	}

	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, fmt.Sprintf("allowlist_%s.txt", partitionModuleName))

	android.WriteFileRule(ctx, emptyAllowlistFile, "")

	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).

		Text(partitionModuleName).

		FlagWithInput("--allowlists ", emptyAllowlistFile)

		Text(partitionModuleName)

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

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

	return diffTestResultFile