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

Add support for missing public / private key files for apexes.

Browse Source 
Test: art/tools/buildbot-build.sh on a manifest that doesn't contain all
dependencies.

Change-Id: I8274bc0b616907032b51bc1b68c54888e7e58571
This commit is contained in:
Nicolas Geoffray
2023-05-15 10:46:38 +01:00
parent df9ae5c9bc
commit 036ff9a5c1
1 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
apex/apex.go
View File

@@ -404,7 +404,7 @@ type apexBundle struct {
///////////////////////////////////////////////////////////////////////////////////////////
// Inputs
// Keys for apex_paylaod.img
// Keys for apex_payload.img
publicKeyFile android.Path
privateKeyFile android.Path
@@ -2606,8 +2606,45 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
ctx.WalkDepsBlueprint(func(child, parent blueprint.Module) bool { return a.depVisitor(&vctx, ctx, child, parent) })
vctx.normalizeFileInfo(ctx)
if a.privateKeyFile == nil {
ctx.PropertyErrorf("key", "private_key for %q could not be found", String(a.overridableProperties.Key))
return
if ctx.Config().AllowMissingDependencies() {
// TODO(b/266099037): a better approach for slim manifests.
ctx.AddMissingDependencies([]string{String(a.overridableProperties.Key)})
// Create placeholder paths for later stages that expect to see those paths,
// though they won't be used.
var unusedPath = android.PathForModuleOut(ctx, "nonexistentprivatekey")
ctx.Build(pctx, android.BuildParams{
Rule: android.ErrorRule,
Output: unusedPath,
Args: map[string]string{
"error": "Private key not available",
},
})
a.privateKeyFile = unusedPath
} else {
ctx.PropertyErrorf("key", "private_key for %q could not be found", String(a.overridableProperties.Key))
return
}
}
if a.publicKeyFile == nil {
if ctx.Config().AllowMissingDependencies() {
// TODO(b/266099037): a better approach for slim manifests.
ctx.AddMissingDependencies([]string{String(a.overridableProperties.Key)})
// Create placeholder paths for later stages that expect to see those paths,
// though they won't be used.
var unusedPath = android.PathForModuleOut(ctx, "nonexistentpublickey")
ctx.Build(pctx, android.BuildParams{
Rule: android.ErrorRule,
Output: unusedPath,
Args: map[string]string{
"error": "Public key not available",
},
})
a.publicKeyFile = unusedPath
} else {
ctx.PropertyErrorf("key", "public_key for %q could not be found", String(a.overridableProperties.Key))
return
}
}
////////////////////////////////////////////////////////////////////////////////////////////