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

Use default app certificate from Make am: 61ae0b7eed

Browse Source 
am: 9d58bf0610

Change-Id: I053f5419cbfb52736defe8dc6844e4b2221ef54f
This commit is contained in:
Colin Cross
2017-12-02 04:50:13 +00:00
committed by android-build-merger
parent cce136b54e 9d58bf0610
commit 04585ff7d8
2 changed files with 14 additions and 2 deletions
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"`