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

Merge "Add mainline dev certificate dir to config"

Browse Source
This commit is contained in:
Treehugger Robot
2022-08-15 11:04:14 +00:00
committed by Gerrit Code Review
parent 05a961ba0f 80fa79830d
commit e0ac9f74a6
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
android/config.go
View File

@@ -798,6 +798,15 @@ func (c *config) ApexKeyDir(ctx ModuleContext) SourcePath {
return PathForSource(ctx, filepath.Dir(defaultCert)) return PathForSource(ctx, filepath.Dir(defaultCert))
} }
// Certificate for the NetworkStack sepolicy context
func (c *config) MainlineSepolicyDevCertificatesDir(ctx ModuleContext) SourcePath {
cert := String(c.productVariables.MainlineSepolicyDevCertificates)
if cert != "" {
return PathForSource(ctx, cert)
}
return c.DefaultAppCertificateDir(ctx)
}
// AllowMissingDependencies configures Blueprint/Soong to not fail when modules // AllowMissingDependencies configures Blueprint/Soong to not fail when modules
// are configured to depend on non-existent modules. Note that this does not // are configured to depend on non-existent modules. Note that this does not
// affect missing input dependencies at the Ninja level. // affect missing input dependencies at the Ninja level.

3
android/variable.go
View File

@@ -249,7 +249,8 @@ type productVariables struct {
AAPTPreferredConfig *string `json:",omitempty"` AAPTPreferredConfig *string `json:",omitempty"`
AAPTPrebuiltDPI []string `json:",omitempty"` AAPTPrebuiltDPI []string `json:",omitempty"`
DefaultAppCertificate *string `json:",omitempty"` DefaultAppCertificate *string `json:",omitempty"`
MainlineSepolicyDevCertificates *string `json:",omitempty"`
AppsDefaultVersionName *string `json:",omitempty"` AppsDefaultVersionName *string `json:",omitempty"`