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

Merge "Remove code about mixed sepolicy build" into main am: 9c14e725e7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2735214

Change-Id: Ibe4a164f7db10e775b1e7f4f57682bb4b71759cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Inseob Kim
2023-09-01 01:33:44 +00:00
committed by Automerger Merge Worker
parent e304013941 9c14e725e7
commit e06a2b2880
2 changed files with 5 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
android/config.go
View File

@@ -1792,30 +1792,6 @@ func (c *deviceConfig) BoardSepolicyVers() string {
return c.PlatformSepolicyVersion()
}
func (c *deviceConfig) BoardPlatVendorPolicy() []string {
return c.config.productVariables.BoardPlatVendorPolicy
}
func (c *deviceConfig) BoardReqdMaskPolicy() []string {
return c.config.productVariables.BoardReqdMaskPolicy
}
func (c *deviceConfig) BoardSystemExtPublicPrebuiltDirs() []string {
return c.config.productVariables.BoardSystemExtPublicPrebuiltDirs
}
func (c *deviceConfig) BoardSystemExtPrivatePrebuiltDirs() []string {
return c.config.productVariables.BoardSystemExtPrivatePrebuiltDirs
}
func (c *deviceConfig) BoardProductPublicPrebuiltDirs() []string {
return c.config.productVariables.BoardProductPublicPrebuiltDirs
}
func (c *deviceConfig) BoardProductPrivatePrebuiltDirs() []string {
return c.config.productVariables.BoardProductPrivatePrebuiltDirs
}
func (c *deviceConfig) SystemExtSepolicyPrebuiltApiDir() string {
return String(c.config.productVariables.SystemExtSepolicyPrebuiltApiDir)
}

16
android/variable.go
View File

@@ -372,17 +372,11 @@ type ProductVariables struct {
MultitreeUpdateMeta bool `json:",omitempty"`
BoardVendorSepolicyDirs []string `json:",omitempty"`
BoardOdmSepolicyDirs []string `json:",omitempty"`
BoardReqdMaskPolicy []string `json:",omitempty"`
BoardPlatVendorPolicy []string `json:",omitempty"`
BoardSystemExtPublicPrebuiltDirs []string `json:",omitempty"`
BoardSystemExtPrivatePrebuiltDirs []string `json:",omitempty"`
BoardProductPublicPrebuiltDirs []string `json:",omitempty"`
BoardProductPrivatePrebuiltDirs []string `json:",omitempty"`
SystemExtPublicSepolicyDirs []string `json:",omitempty"`
SystemExtPrivateSepolicyDirs []string `json:",omitempty"`
BoardSepolicyM4Defs []string `json:",omitempty"`
BoardVendorSepolicyDirs []string `json:",omitempty"`
BoardOdmSepolicyDirs []string `json:",omitempty"`
SystemExtPublicSepolicyDirs []string `json:",omitempty"`
SystemExtPrivateSepolicyDirs []string `json:",omitempty"`
BoardSepolicyM4Defs []string `json:",omitempty"`
BoardSepolicyVers *string `json:",omitempty"`
PlatformSepolicyVersion *string `json:",omitempty"`