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

Merge "Prebuilt APEXes are recoreded in apexkeys.txt" into qt-dev

Browse Source 
am: a25a2779c6

Change-Id: Ia6f97ecf118b6a74f68ddc6c69ece35ee8fe934d
This commit is contained in:
Jiyong Park
2019-04-23 21:42:24 -07:00
committed by android-build-merger
parent 9901de43b4 a25a2779c6
commit ded02fab27
3 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
apex/key.go
View File

@@ -16,6 +16,7 @@ package apex
import (
"fmt"
"sort"
"strings"
"android/soong/android"
@@ -105,12 +106,31 @@ type apexKeysText struct {
func (s *apexKeysText) GenerateBuildActions(ctx android.SingletonContext) {
s.output = android.PathForOutput(ctx, "apexkeys.txt")
var filecontent strings.Builder
apexModulesMap := make(map[string]android.Module)
ctx.VisitAllModules(func(module android.Module) {
if m, ok := module.(android.Module); ok && !m.Enabled() {
return
if m, ok := module.(*apexBundle); ok && m.Enabled() && m.installable() {
apexModulesMap[m.Name()] = m
}
})
// Find prebuilts and let them override apexBundle if they are preferred
ctx.VisitAllModules(func(module android.Module) {
if m, ok := module.(*Prebuilt); ok && m.Enabled() && m.installable() &&
m.Prebuilt().UsePrebuilt() {
apexModulesMap[m.BaseModuleName()] = m
}
})
// iterating over map does not give consistent ordering in golang
var moduleNames []string
for key, _ := range apexModulesMap {
moduleNames = append(moduleNames, key)
}
sort.Strings(moduleNames)
var filecontent strings.Builder
for _, key := range moduleNames {
module := apexModulesMap[key]
if m, ok := module.(*apexBundle); ok {
fmt.Fprintf(&filecontent,
"name=%q public_key=%q private_key=%q container_certificate=%q container_private_key=%q\\n",
@@ -119,8 +139,14 @@ func (s *apexKeysText) GenerateBuildActions(ctx android.SingletonContext) {
m.private_key_file.String(),
m.container_certificate_file.String(),
m.container_private_key_file.String())
} else if m, ok := module.(*Prebuilt); ok {
fmt.Fprintf(&filecontent,
"name=%q public_key=%q private_key=%q container_certificate=%q container_private_key=%q\\n",
m.InstallFilename(),
"PRESIGNED", "PRESIGNED", "PRESIGNED", "PRESIGNED")
}
})
}
ctx.Build(pctx, android.BuildParams{
Rule: android.WriteFile,
Description: "apexkeys.txt",