openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Extract generateUpdatableBcpPackagesRule from updatableBcpPackagesRule"

This commit is contained in:
Paul Duffin 2021-04-28 12:01:23 +00:00 committed by Gerrit Code Review
parent c2477e8224 44d1594081
commit 0e98e86a3c
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
java/dexpreopt_bootjars.go
View File

@ -893,29 +893,39 @@ func updatableBcpPackagesRule(ctx android.SingletonContext, image *bootImageConf
} }
global := dexpreopt.GetGlobalConfig(ctx) global := dexpreopt.GetGlobalConfig(ctx)
var modules []android.Module
updatableModules := global.UpdatableBootJars.CopyOfJars() updatableModules := global.UpdatableBootJars.CopyOfJars()
// Collect `permitted_packages` for updatable boot jars.
var updatablePackages []string
ctx.VisitAllModules(func(module android.Module) { ctx.VisitAllModules(func(module android.Module) {
if !isActiveModule(module) { if !isActiveModule(module) {
return return
} }
if j, ok := module.(PermittedPackagesForUpdatableBootJars); ok { name := ctx.ModuleName(module)
name := ctx.ModuleName(module) if i := android.IndexList(name, updatableModules); i != -1 {
if i := android.IndexList(name, updatableModules); i != -1 { modules = append(modules, module)
pp := j.PermittedPackagesForUpdatableBootJars() // Do not match the same library repeatedly.
if len(pp) > 0 { updatableModules = append(updatableModules[:i], updatableModules[i+1:]...)
updatablePackages = append(updatablePackages, pp...)
} else {
ctx.Errorf("Missing permitted_packages for %s", name)
}
// Do not match the same library repeatedly.
updatableModules = append(updatableModules[:i], updatableModules[i+1:]...)
}
} }
}) })
return generateUpdatableBcpPackagesRule(ctx, image, modules)
}
// generateUpdatableBcpPackagesRule generates the rule to create the updatable-bcp-packages.txt file
// and returns a path to the generated file.
func generateUpdatableBcpPackagesRule(ctx android.SingletonContext, image *bootImageConfig, updatableModules []android.Module) android.WritablePath {
// Collect `permitted_packages` for updatable boot jars.
var updatablePackages []string
for _, module := range updatableModules {
if j, ok := module.(PermittedPackagesForUpdatableBootJars); ok {
pp := j.PermittedPackagesForUpdatableBootJars()
if len(pp) > 0 {
updatablePackages = append(updatablePackages, pp...)
} else {
ctx.Errorf("Missing permitted_packages for %s", ctx.ModuleName(module))
}
}
}
// Sort updatable packages to ensure deterministic ordering. // Sort updatable packages to ensure deterministic ordering.
sort.Strings(updatablePackages) sort.Strings(updatablePackages)