Merge "Add all compile deps to module_bp_java_deps.json" into main
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 91f2056..37e26f9 100644
--- a/android/module.go
+++ b/android/module.go
@@ -2213,6 +2213,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 3b02bc7..b2173ec 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -520,6 +520,8 @@
BoardUseVbmetaDigestInFingerprint *bool `json:",omitempty"`
OemProperties []string `json:",omitempty"`
+
+ ArtTargetIncludeDebugBuild *bool `json:",omitempty"`
}
type PartitionQualifiedVariablesType struct {
diff --git a/scripts/buildinfo.py b/scripts/buildinfo.py
index db99209..8a24b63 100755
--- a/scripts/buildinfo.py
+++ b/scripts/buildinfo.py
@@ -132,7 +132,7 @@
# Dev. branches should have DISPLAY_BUILD_NUMBER set
if option.display_build_number:
- print(f"ro.build.display.id?={option.build_id} {build_number} {option.build_keys}")
+ print(f"ro.build.display.id?={option.build_id}.{build_number} {option.build_keys}")
else:
print(f"ro.build.display.id?={option.build_id} {option.build_keys}")
else:
diff --git a/scripts/gen_build_prop.py b/scripts/gen_build_prop.py
index 799e00b..9ea56cb 100644
--- a/scripts/gen_build_prop.py
+++ b/scripts/gen_build_prop.py
@@ -188,7 +188,7 @@
# Dev. branches should have DISPLAY_BUILD_NUMBER set
if config["DisplayBuildNumber"]:
- print(f"ro.build.display.id?={config['BuildId']} {config['BuildNumber']} {config['BuildKeys']}")
+ print(f"ro.build.display.id?={config['BuildId']}.{config['BuildNumber']} {config['BuildKeys']}")
else:
print(f"ro.build.display.id?={config['BuildId']} {config['BuildKeys']}")
else: