diff options
| -rw-r--r-- | android/config.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/android/config.go b/android/config.go index f6d08b841..a5edf0da8 100644 --- a/android/config.go +++ b/android/config.go @@ -2275,10 +2275,18 @@ func (c *config) OemProperties() []string { } func (c *config) UseDebugArt() bool { + // If the ArtTargetIncludeDebugBuild product variable is set then return its value. if c.productVariables.ArtTargetIncludeDebugBuild != nil { return Bool(c.productVariables.ArtTargetIncludeDebugBuild) } + // If the RELEASE_APEX_CONTRIBUTIONS_ART build flag is set to use a prebuilt ART apex + // then don't use the debug apex. + if val, ok := c.GetBuildFlag("RELEASE_APEX_CONTRIBUTIONS_ART"); ok && val != "" { + return false + } + + // Default to the debug apex for eng builds. return Bool(c.productVariables.Eng) } |