diff options
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | apex/key.go | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index 47a195c1d..98552a779 100644 --- a/Android.bp +++ b/Android.bp @@ -256,5 +256,8 @@ build_prop { all_apex_certs { name: "all_apex_certs", - visibility: ["//cts/tests/tests/security"], + visibility: [ + "//cts/tests/tests/security", + "//cts/hostsidetests/appsecurity", + ], } diff --git a/apex/key.go b/apex/key.go index 9fa9d1e02..1622c65e6 100644 --- a/apex/key.go +++ b/apex/key.go @@ -182,6 +182,7 @@ type allApexCerts struct { } func (_ *allApexCerts) GenerateAndroidBuildActions(ctx android.ModuleContext) { + var avbpubkeys android.Paths var certificatesPem android.Paths ctx.VisitDirectDeps(func(m android.Module) { if apex, ok := m.(*apexBundle); ok { @@ -194,9 +195,12 @@ func (_ *allApexCerts) GenerateAndroidBuildActions(ctx android.ModuleContext) { } } certificatesPem = append(certificatesPem, pem) + // avbpubkey for signing the apex payload + avbpubkeys = append(avbpubkeys, apex.publicKeyFile) } }) certificatesPem = android.SortedUniquePaths(certificatesPem) // For hermiticity + avbpubkeys = android.SortedUniquePaths(avbpubkeys) // For hermiticity var certificatesDer android.Paths for index, certificatePem := range certificatesPem { certificateDer := android.PathForModuleOut(ctx, fmt.Sprintf("x509.%v.der", index)) @@ -209,6 +213,7 @@ func (_ *allApexCerts) GenerateAndroidBuildActions(ctx android.ModuleContext) { } ctx.SetOutputFiles(certificatesPem, ".pem") ctx.SetOutputFiles(certificatesDer, ".der") + ctx.SetOutputFiles(avbpubkeys, ".avbpubkey") } func (_ *allApexCerts) GenerateSingletonBuildActions(ctx android.SingletonContext) { |