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
diff --git a/android/config.go b/android/config.go
index d16377d..0e3b0a1 100644
--- a/android/config.go
+++ b/android/config.go
@@ -2127,3 +2127,11 @@
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)
+}
diff --git a/android/module.go b/android/module.go
index 75e73c6..6ad4624 100644
--- a/android/module.go
+++ b/android/module.go
@@ -2221,6 +2221,9 @@
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))
diff --git a/android/variable.go b/android/variable.go
index d144f7d..4e2954a 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -518,6 +518,8 @@
BoardUseVbmetaDigestInFingerprint *bool `json:",omitempty"`
OemProperties []string `json:",omitempty"`
+
+ ArtTargetIncludeDebugBuild *bool `json:",omitempty"`
}
type PartitionQualifiedVariablesType struct {