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

Merge "Apply EnforceRROExemptedTargets in Soong" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-23 01:25:49 +00:00
committed by Android (Google) Code Review
parent b636300911 8691f3f75c
commit c8e0a44e2b
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

@@ -862,6 +862,13 @@ func (c *config) ArtUseReadBarrier() bool {
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 exemptedList != nil {
if InList(name, exemptedList) {
return false
}
}
if enforceList != nil {
if InList("*", enforceList) {
return true

8
android/variable.go
View File

@@ -187,9 +187,11 @@ type productVariables struct {
CrossHostArch *string `json:",omitempty"`
CrossHostSecondaryArch *string `json:",omitempty"`
DeviceResourceOverlays []string `json:",omitempty"`
ProductResourceOverlays []string `json:",omitempty"`
EnforceRROTargets []string `json:",omitempty"`
DeviceResourceOverlays []string `json:",omitempty"`
ProductResourceOverlays []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"`
AAPTCharacteristics *string `json:",omitempty"`