From 80fa79830d1c8bb3b04ceb37ffb4bac8178e4a39 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Fri, 12 Aug 2022 21:36:25 +0900 Subject: [PATCH] Add mainline dev certificate dir to config Bug: 33691272 Test: build Change-Id: I22aa2f016042eed8555c66a19caeb8967416484d --- android/config.go | 9 +++++++++ android/variable.go | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/android/config.go b/android/config.go index 84c17dee3..c2fcbfca1 100644 --- a/android/config.go +++ b/android/config.go @@ -915,6 +915,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"`