tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use default app certificate from Make

Browse source 
Bug: 69917341
Test: m checkbuild
Test: framework-res.apk is identical after converting to Soong
Change-Id: I6980afd94ea130740da0defeea045eddc2fc6439
This commit is contained in:
Colin Cross 2017-12-01 17:16:02 -08:00
parent a1a966734c
commit 61ae0b7eed
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/config.go
View file

@ -491,11 +491,21 @@ func (c *config) ProductAAPTPrebuiltDPI() []string {
}
func (c *config) DefaultAppCertificateDir(ctx PathContext) SourcePath {
return PathForSource(ctx, "build/target/product/security")
defaultCert := String(c.ProductVariables.DefaultAppCertificate)
if defaultCert != "" {
return PathForSource(ctx, filepath.Dir(defaultCert))
} else {
return PathForSource(ctx, "build/target/product/security")
}
}
func (c *config) DefaultAppCertificate(ctx PathContext) SourcePath {
return c.DefaultAppCertificateDir(ctx).Join(ctx, "testkey")
defaultCert := String(c.ProductVariables.DefaultAppCertificate)
if defaultCert != "" {
return PathForSource(ctx, defaultCert)
} else {
return c.DefaultAppCertificateDir(ctx).Join(ctx, "testkey")
}
}
func (c *config) AllowMissingDependencies() bool {

2
android/variable.go
View file

@ -141,6 +141,8 @@ type productVariables struct {
AAPTPreferredConfig *string `json:",omitempty"`
AAPTPrebuiltDPI *[]string `json:",omitempty"`
DefaultAppCertificate *string `json:",omitempty"`
AppsDefaultVersionName *string `json:",omitempty"`
Allow_missing_dependencies *bool `json:",omitempty"`