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

Merge "Apply EnforceRROExemptedTargets in Soong" am: 4726b9c8a0

Browse Source 
Change-Id: I8eb75b995bf47473c09059bf230e6e1821d7066a
This commit is contained in:
Treehugger Robot
2020-03-19 02:09:56 +00:00
committed by Automerger Merge Worker
parent 03a453c360 4726b9c8a0
commit eb3ac76202
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android/config.go
View File

@@ -872,6 +872,13 @@ func (c *config) ArtUseReadBarrier() bool {
func (c *config) EnforceRROForModule(name string) bool { func (c *config) EnforceRROForModule(name string) bool {
enforceList := c.productVariables.EnforceRROTargets enforceList := c.productVariables.EnforceRROTargets
// TODO(b/150820813) Some modules depend on static overlay, remove this after eliminating the dependency.
exemptedList := c.productVariables.EnforceRROExemptedTargets
if exemptedList != nil {
if InList(name, exemptedList) {
return false
}
}
if enforceList != nil { if enforceList != nil {
if InList("*", enforceList) { if InList("*", enforceList) {
return true return true

8
android/variable.go
View File

@@ -188,9 +188,11 @@ type productVariables struct {
CrossHostArch *string `json:",omitempty"` CrossHostArch *string `json:",omitempty"`
CrossHostSecondaryArch *string `json:",omitempty"` CrossHostSecondaryArch *string `json:",omitempty"`
DeviceResourceOverlays []string `json:",omitempty"` DeviceResourceOverlays []string `json:",omitempty"`
ProductResourceOverlays []string `json:",omitempty"` ProductResourceOverlays []string `json:",omitempty"`
EnforceRROTargets []string `json:",omitempty"` EnforceRROTargets []string `json:",omitempty"`
// TODO(b/150820813) Some modules depend on static overlay, remove this after eliminating the dependency.
EnforceRROExemptedTargets []string `json:",omitempty"`
EnforceRROExcludedOverlays []string `json:",omitempty"` EnforceRROExcludedOverlays []string `json:",omitempty"`
AAPTCharacteristics *string `json:",omitempty"` AAPTCharacteristics *string `json:",omitempty"`