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

Use default app certificate from Make

Browse Source 
am: 61ae0b7eed

Change-Id: I272e259e0988add4648cf43eb66c1fb159714081
This commit is contained in:
Colin Cross
2017-12-02 04:46:20 +00:00
committed by android-build-merger
parent 36ae868271 61ae0b7eed
commit 9d58bf0610
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android/config.go
View File

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

2
android/variable.go
View File

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