diff options
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/java/java.go b/java/java.go index d19c88e56..0702e618f 100644 --- a/java/java.go +++ b/java/java.go @@ -467,9 +467,6 @@ 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 @@ -1530,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 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) + // 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) if ctx.Failed() { return |