diff --git a/android/config.go b/android/config.go index 3e7dc4704..d3f8ab463 100644 --- a/android/config.go +++ b/android/config.go @@ -798,6 +798,15 @@ func (c *config) ApexKeyDir(ctx ModuleContext) SourcePath { 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 // are configured to depend on non-existent modules. Note that this does not // affect missing input dependencies at the Ninja level. diff --git a/android/variable.go b/android/variable.go index 874b69d9c..86b8c8fb1 100644 --- a/android/variable.go +++ b/android/variable.go @@ -249,7 +249,8 @@ type productVariables struct { AAPTPreferredConfig *string `json:",omitempty"` AAPTPrebuiltDPI []string `json:",omitempty"` - DefaultAppCertificate *string `json:",omitempty"` + DefaultAppCertificate *string `json:",omitempty"` + MainlineSepolicyDevCertificates *string `json:",omitempty"` AppsDefaultVersionName *string `json:",omitempty"`