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

Merge "Remove EnforceRROExemptedTargets"

Browse Source
This commit is contained in:
Treehugger Robot
2021-02-20 01:47:43 +00:00
committed by Gerrit Code Review
parent 272649ceb5 cee5ba973d
commit f0a869847a
4 changed files with 21 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android/config.go
View File

@@ -946,13 +946,7 @@ func (c *config) ArtUseReadBarrier() bool {
// More info: https://source.android.com/devices/architecture/rros
func (c *config) EnforceRROForModule(name string) bool {
enforceList := c.productVariables.EnforceRROTargets
// TODO(b/150820813) Some modules depend on static overlay, remove this after eliminating the dependency.
exemptedList := c.productVariables.EnforceRROExemptedTargets
if len(exemptedList) > 0 {
if InList(name, exemptedList) {
return false
}
}
if len(enforceList) > 0 {
if InList("*", enforceList) {
return true
@@ -961,11 +955,6 @@ func (c *config) EnforceRROForModule(name string) bool {
}
return false
}
func (c *config) EnforceRROExemptedForModule(name string) bool {
return InList(name, c.productVariables.EnforceRROExemptedTargets)
}
func (c *config) EnforceRROExcludedOverlay(path string) bool {
excluded := c.productVariables.EnforceRROExcludedOverlays
if len(excluded) > 0 {