diff options
| author | Jeongik Cha <jeongik@google.com> | 2020-03-09 12:37:05 +0900 |
|---|---|---|
| committer | Jeongik Cha <jeongik@google.com> | 2020-04-20 14:02:23 +0000 |
| commit | 8691f3f75c3f64ba83ee0ac8f9ed6c07f47a2c4b (patch) | |
| tree | d49a240cec3d5201cc66668246d559a279a3fe57 | |
| parent | 39a06440cd074399ad6d7af20102b7520897d2f3 (diff) | |
| download | build_soong-8691f3f75c3f64ba83ee0ac8f9ed6c07f47a2c4b.tar.gz build_soong-8691f3f75c3f64ba83ee0ac8f9ed6c07f47a2c4b.tar.bz2 build_soong-8691f3f75c3f64ba83ee0ac8f9ed6c07f47a2c4b.zip | |
Apply EnforceRROExemptedTargets in Soong
As PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS is defined in make, define it in
soong accordingly
Bug: 150820813
Test: m
Change-Id: I309482b6ad439a7602127f68f2f7ffa856b9e192
Merged-In: I309482b6ad439a7602127f68f2f7ffa856b9e192
| -rw-r--r-- | android/config.go | 7 | ||||
| -rw-r--r-- | android/variable.go | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/android/config.go b/android/config.go index a0418d8d..859e164b 100644 --- a/android/config.go +++ b/android/config.go @@ -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 diff --git a/android/variable.go b/android/variable.go index 4d1b5e42..118e1076 100644 --- a/android/variable.go +++ b/android/variable.go @@ -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"` |