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

Merge "Add 'use_debug_art' to product_variable" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-07-19 03:21:23 +00:00
committed by Gerrit Code Review
parent 66884937f8 881e465fda
commit 00abdc02de
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/config.go
View File

@@ -2127,3 +2127,11 @@ func (c *config) BoardUseVbmetaDigestInFingerprint() bool {
func (c *config) OemProperties() []string { func (c *config) OemProperties() []string {
return c.productVariables.OemProperties return c.productVariables.OemProperties
} }
func (c *config) UseDebugArt() bool {
if c.productVariables.ArtTargetIncludeDebugBuild != nil {
return Bool(c.productVariables.ArtTargetIncludeDebugBuild)
}
return Bool(c.productVariables.Eng)
}

3
android/module.go
View File

@@ -2213,6 +2213,9 @@ func (e configurationEvalutor) EvaluateConfiguration(condition proptools.Configu
switch variable { switch variable {
case "debuggable": case "debuggable":
return proptools.ConfigurableValueBool(ctx.Config().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: default:
// TODO(b/323382414): Might add these on a case-by-case basis // 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)) ctx.OtherModulePropertyErrorf(m, property, fmt.Sprintf("TODO(b/323382414): Product variable %q is not yet supported in selects", variable))

2
android/variable.go
View File

@@ -520,6 +520,8 @@ type ProductVariables struct {
BoardUseVbmetaDigestInFingerprint *bool `json:",omitempty"` BoardUseVbmetaDigestInFingerprint *bool `json:",omitempty"`
OemProperties []string `json:",omitempty"` OemProperties []string `json:",omitempty"`
ArtTargetIncludeDebugBuild *bool `json:",omitempty"`
} }
type PartitionQualifiedVariablesType struct { type PartitionQualifiedVariablesType struct {