diff options
Diffstat (limited to 'java/app.go')
| -rw-r--r-- | java/app.go | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/java/app.go b/java/app.go index 0db48e76..9360cc56 100644 --- a/java/app.go +++ b/java/app.go @@ -310,7 +310,16 @@ func (a *AndroidApp) aapt2Flags(ctx android.ModuleContext) (flags []string, deps } if !hasVersionName { - versionName := proptools.NinjaEscape([]string{ctx.Config().AppsDefaultVersionName()})[0] + var versionName string + if ctx.ModuleName() == "framework-res" { + // Some builds set AppsDefaultVersionName() to include the build number ("O-123456"). aapt2 copies the + // version name of framework-res into app manifests as compileSdkVersionCodename, which confuses things + // if it contains the build number. Use the DefaultAppTargetSdk instead. + versionName = ctx.Config().DefaultAppTargetSdk() + } else { + versionName = ctx.Config().AppsDefaultVersionName() + } + versionName = proptools.NinjaEscape([]string{versionName})[0] linkFlags = append(linkFlags, "--version-name ", versionName) } |