Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a6d53d6 authored by Inseob Kim's avatar Inseob Kim Committed by Gerrit Code Review
Browse files

Merge "Support building mixed versions of sepolicy"

parents 0d96ed8d 16ebd5a0

android/config.go

+12 −0
Original line number Diff line number Diff line
@@ -1364,6 +1364,18 @@ func (c *deviceConfig) BoardMoveRecoveryResourcesToVendorBoot() bool { 
	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.

// 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

android/variable.go

+4 −0
Original line number Diff line number Diff line
@@ -311,10 +311,14 @@ type productVariables struct { 


	BoardVendorSepolicyDirs      []string `json:",omitempty"`

	BoardOdmSepolicyDirs         []string `json:",omitempty"`

	BoardReqdMaskPolicy          []string `json:",omitempty"`

	SystemExtPublicSepolicyDirs  []string `json:",omitempty"`

	SystemExtPrivateSepolicyDirs []string `json:",omitempty"`

	BoardSepolicyM4Defs          []string `json:",omitempty"`



	BoardSepolicyVers       *string `json:",omitempty"`

	PlatformSepolicyVersion *string `json:",omitempty"`



	VendorVars map[string]map[string]string `json:",omitempty"`



	Ndk_abis               *bool `json:",omitempty"`