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

Merge "Apply EnforceRROExemptedTargets in Soong"

Browse Source
This commit is contained in:
Treehugger Robot
2020-03-19 01:47:54 +00:00
committed by Gerrit Code Review
parent 0528180f4b b9b1327c2d
commit 4726b9c8a0
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

2
android/variable.go
View File

@@ -191,6 +191,8 @@ type productVariables struct {
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"`