From a20a875fa94c57be8fc2464d08cdb1271bc6c6a7 Mon Sep 17 00:00:00 2001 From: Felix Date: Sun, 17 May 2020 18:28:35 +0200 Subject: [PATCH] android/: Rename Plat->SystemExt*SepolicyDirs Align with changes in system/sepolicy and build/make. Signed-off-by: Felix Change-Id: I326962648a78e68e8cc83fdc22d8274eaecb8c8c --- android/config.go | 8 ++++---- android/variable.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/config.go b/android/config.go index ee31c1003..d81e7db35 100644 --- a/android/config.go +++ b/android/config.go @@ -1064,12 +1064,12 @@ func (c *deviceConfig) OdmSepolicyDirs() []string { return c.config.productVariables.BoardOdmSepolicyDirs } -func (c *deviceConfig) PlatPublicSepolicyDirs() []string { - return c.config.productVariables.BoardPlatPublicSepolicyDirs +func (c *deviceConfig) SystemExtPublicSepolicyDirs() []string { + return c.config.productVariables.SystemExtPublicSepolicyDirs } -func (c *deviceConfig) PlatPrivateSepolicyDirs() []string { - return c.config.productVariables.BoardPlatPrivateSepolicyDirs +func (c *deviceConfig) SystemExtPrivateSepolicyDirs() []string { + return c.config.productVariables.SystemExtPrivateSepolicyDirs } func (c *deviceConfig) SepolicyM4Defs() []string { diff --git a/android/variable.go b/android/variable.go index 3c08405dd..591e2a981 100644 --- a/android/variable.go +++ b/android/variable.go @@ -302,8 +302,8 @@ type productVariables struct { BoardVendorSepolicyDirs []string `json:",omitempty"` BoardOdmSepolicyDirs []string `json:",omitempty"` - BoardPlatPublicSepolicyDirs []string `json:",omitempty"` - BoardPlatPrivateSepolicyDirs []string `json:",omitempty"` + SystemExtPublicSepolicyDirs []string `json:",omitempty"` + SystemExtPrivateSepolicyDirs []string `json:",omitempty"` BoardSepolicyM4Defs []string `json:",omitempty"` BoardVndkRuntimeDisable *bool `json:",omitempty"`