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

Commit 881e465f authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

Add 'use_debug_art' to product_variable 

Add 'use_debug_art' property to product_variable so it can be checked
from Android.bp whether ART debug APEX or ART APEX should be used.

Bug: 351698657
Test: AOSP CF eng build succeeded
Test: AOSP CF userdebug build succeeded
Change-Id: I01cd80f0d899c55828ecb05fdafdc9bb05fd8200
parent 96787337

android/config.go

+8 −0
Original line number Diff line number Diff line
@@ -2127,3 +2127,11 @@ func (c *config) BoardUseVbmetaDigestInFingerprint() bool { 
func (c *config) OemProperties() []string {

	return c.productVariables.OemProperties

}



func (c *config) UseDebugArt() bool {

	if c.productVariables.ArtTargetIncludeDebugBuild != nil {

		return Bool(c.productVariables.ArtTargetIncludeDebugBuild)

	}



	return Bool(c.productVariables.Eng)

}

android/module.go

+3 −0
Original line number Diff line number Diff line
@@ -2221,6 +2221,9 @@ func (e configurationEvalutor) EvaluateConfiguration(condition proptools.Configu 
		switch variable {

		case "debuggable":

			return proptools.ConfigurableValueBool(ctx.Config().Debuggable())

		case "use_debug_art":

			// TODO(b/234351700): Remove once ART does not have separated debug APEX

			return proptools.ConfigurableValueBool(ctx.Config().UseDebugArt())

		default:

			// TODO(b/323382414): Might add these on a case-by-case basis

			ctx.OtherModulePropertyErrorf(m, property, fmt.Sprintf("TODO(b/323382414): Product variable %q is not yet supported in selects", variable))

android/variable.go

+2 −0
Original line number Diff line number Diff line
@@ -518,6 +518,8 @@ type ProductVariables struct { 
	BoardUseVbmetaDigestInFingerprint *bool `json:",omitempty"`



	OemProperties []string `json:",omitempty"`



	ArtTargetIncludeDebugBuild *bool `json:",omitempty"`

}



type PartitionQualifiedVariablesType struct {