StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always run package check am: 91206d9ed1 am: d08b1040cb

Browse Source 
Original change: undetermined

Change-Id: I7eed39d6b49b0e837c8ad0689a8e728f7b329e41
This commit is contained in:
Paul Duffin
2020-06-02 13:31:18 +00:00
committed by Automerger Merge Worker
parent 804dd8142c d08b1040cb
commit 56e303ae4e
3 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/java.go
View File

@@ -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