Revert "Always run package check"

This reverts commit aa7359ab0c.

Reason for revert: package-check.sh doesn't work on mac

Change-Id: Ia3dcee612c1f6b4121e1351c8710638ae41bc88a
Merged-In: I50af71d54d5f1f8b516bfcf1efbcf6217e89c83a
This commit is contained in:
Tej Singh
2020-06-03 18:45:54 +00:00
parent aa7359ab0c
commit 8383972ec0
3 changed files with 34 additions and 11 deletions

View File

@@ -467,6 +467,9 @@ type Module struct {
// expanded Jarjar_rules
expandJarjarRules android.Path
// list of additional targets for checkbuild
additionalCheckedModules android.Paths
// Extra files generated by the module type to be added as java resources.
extraResources android.Paths
@@ -1524,10 +1527,10 @@ 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 input to package-checked file.
// Use the file copied after a successful package check as the output file for this
// module so that any dependencies on this module will trigger the package check.
outputFile = CheckJarPackages(ctx, outputFile, j.properties.Permitted_packages)
// Check packages and copy to package-checked file.
pkgckFile := android.PathForModuleOut(ctx, "package-check.stamp")
CheckJarPackages(ctx, pkgckFile, outputFile, j.properties.Permitted_packages)
j.additionalCheckedModules = append(j.additionalCheckedModules, pkgckFile)
if ctx.Failed() {
return