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

Commit 0c89f5fb authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Always perform permitted package check when building a library" am:... 

Merge "Always perform permitted package check when building a library" am: f7db6eba am: 7f04fb7d

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1842459

Change-Id: I6e6f0cb3938671550d3d38fb0901bd09fc9e7ff6
parents 3c4cfc88 7f04fb7d

java/base.go

+17 −2
Original line number Diff line number Diff line
@@ -1265,10 +1265,25 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { 


	// Check package restrictions if necessary.

	if len(j.properties.Permitted_packages) > 0 {

		// Check packages and copy to package-checked file.

		// Time stamp file created by the package check rule.

		pkgckFile := android.PathForModuleOut(ctx, "package-check.stamp")



		// Create a rule to copy the output jar to another path and add a validate dependency that

		// will check that the jar only contains the permitted packages. The new location will become

		// the output file of this module.

		inputFile := outputFile

		outputFile = android.PathForModuleOut(ctx, "package-check", jarName).OutputPath

		ctx.Build(pctx, android.BuildParams{

			Rule:   android.Cp,

			Input:  inputFile,

			Output: outputFile,

			// Make sure that any dependency on the output file will cause ninja to run the package check

			// rule.

			Validation: pkgckFile,

		})



		// Check packages and create a timestamp file when complete.

		CheckJarPackages(ctx, pkgckFile, outputFile, j.properties.Permitted_packages)

		j.additionalCheckedModules = append(j.additionalCheckedModules, pkgckFile)



		if ctx.Failed() {

			return