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

Export app certificates to Make for apkcerts list

Browse Source 
Bug: 70669383
Test: m apkcerts-list contains framework-res.apk
Change-Id: I38af458e4262371c9c8368b5eebcff063a9bc359
This commit is contained in:
Colin Cross
2017-12-14 11:22:55 -08:00
parent 16056060d5
commit e1731a5803
4 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android/config.go
View File

@@ -511,12 +511,13 @@ func (c *config) DefaultAppCertificateDir(ctx PathContext) SourcePath {
}
}
func (c *config) DefaultAppCertificate(ctx PathContext) SourcePath {
func (c *config) DefaultAppCertificate(ctx PathContext) (pem, key SourcePath) {
defaultCert := String(c.ProductVariables.DefaultAppCertificate)
if defaultCert != "" {
return PathForSource(ctx, defaultCert)
return PathForSource(ctx, defaultCert+".x509.pem"), PathForSource(ctx, defaultCert+".pk8")
} else {
return c.DefaultAppCertificateDir(ctx).Join(ctx, "testkey")
defaultDir := c.DefaultAppCertificateDir(ctx)
return defaultDir.Join(ctx, "testkey.x509.pem"), defaultDir.Join(ctx, "testkey.pk8")
}
}