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

Merge "Support building mixed versions of sepolicy"

Browse Source
This commit is contained in:
Inseob Kim
2021-01-06 05:07:05 +00:00
committed by Gerrit Code Review
parent 0d96ed8d5b 16ebd5a006
commit 4a6d53d6cd
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android/config.go
View File

@@ -1364,6 +1364,18 @@ func (c *deviceConfig) BoardMoveRecoveryResourcesToVendorBoot() bool {
return Bool(c.config.productVariables.BoardMoveRecoveryResourcesToVendorBoot) return Bool(c.config.productVariables.BoardMoveRecoveryResourcesToVendorBoot)
} }
func (c *deviceConfig) PlatformSepolicyVersion() string {
return String(c.config.productVariables.PlatformSepolicyVersion)
}
func (c *deviceConfig) BoardSepolicyVers() string {
return String(c.config.productVariables.BoardSepolicyVers)
}
func (c *deviceConfig) BoardReqdMaskPolicy() []string {
return c.config.productVariables.BoardReqdMaskPolicy
}
// The ConfiguredJarList struct provides methods for handling a list of (apex, jar) pairs. // The ConfiguredJarList struct provides methods for handling a list of (apex, jar) pairs.
// Such lists are used in the build system for things like bootclasspath jars or system server jars. // Such lists are used in the build system for things like bootclasspath jars or system server jars.
// The apex part is either an apex name, or a special names "platform" or "system_ext". Jar is a // The apex part is either an apex name, or a special names "platform" or "system_ext". Jar is a

4
android/variable.go
View File

@@ -311,10 +311,14 @@ type productVariables struct {
BoardVendorSepolicyDirs []string `json:",omitempty"` BoardVendorSepolicyDirs []string `json:",omitempty"`
BoardOdmSepolicyDirs []string `json:",omitempty"` BoardOdmSepolicyDirs []string `json:",omitempty"`
BoardReqdMaskPolicy []string `json:",omitempty"`
SystemExtPublicSepolicyDirs []string `json:",omitempty"` SystemExtPublicSepolicyDirs []string `json:",omitempty"`
SystemExtPrivateSepolicyDirs []string `json:",omitempty"` SystemExtPrivateSepolicyDirs []string `json:",omitempty"`
BoardSepolicyM4Defs []string `json:",omitempty"` BoardSepolicyM4Defs []string `json:",omitempty"`
BoardSepolicyVers *string `json:",omitempty"`
PlatformSepolicyVersion *string `json:",omitempty"`
VendorVars map[string]map[string]string `json:",omitempty"` VendorVars map[string]map[string]string `json:",omitempty"`
Ndk_abis *bool `json:",omitempty"` Ndk_abis *bool `json:",omitempty"`