Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9b1327c authored Mar 09, 2020 by Jeongik Cha

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

parent 323a4c3a

android/config.go

+7 −0

Original line number	Diff line number	Diff line
		@@ -878,6 +878,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

android/variable.go

+5 −3

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