diff options
| author | 2024-10-01 09:39:53 +0000 | |
|---|---|---|
| committer | 2024-10-01 09:39:53 +0000 | |
| commit | 130da8b89aa41b3833613770ae273325d5f47f5a (patch) | |
| tree | d64154537261f9cb6d75dd1766938d8ca18e37ea /apex/builder.go | |
| parent | c27cb7a8b54fab98aa6ea2dbadf3fb6ead712499 (diff) | |
| parent | 3a6eced43169aa0386bd761a1ab0f3d49b5c3fcd (diff) | |
Merge "Set version code of apex and apk based on RELEASE_DEFAULT_UPDATABLE_MODULE_VERSION." into main
Diffstat (limited to 'apex/builder.go')
| -rw-r--r-- | apex/builder.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apex/builder.go b/apex/builder.go index bf3ba9f99..4db20e986 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -360,14 +360,14 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs, } manifestJsonFullOut := android.PathForModuleOut(ctx, "apex_manifest_full.json") - defaultVersion := android.DefaultUpdatableModuleVersion + defaultVersion := ctx.Config().ReleaseDefaultUpdatableModuleVersion() if a.properties.Variant_version != nil { defaultVersionInt, err := strconv.Atoi(defaultVersion) if err != nil { - ctx.ModuleErrorf("expected DefaultUpdatableModuleVersion to be an int, but got %s", defaultVersion) + ctx.ModuleErrorf("expected RELEASE_DEFAULT_UPDATABLE_MODULE_VERSION to be an int, but got %s", defaultVersion) } if defaultVersionInt%10 != 0 { - ctx.ModuleErrorf("expected DefaultUpdatableModuleVersion to end in a zero, but got %s", defaultVersion) + ctx.ModuleErrorf("expected RELEASE_DEFAULT_UPDATABLE_MODULE_VERSION to end in a zero, but got %s", defaultVersion) } variantVersion := []rune(*a.properties.Variant_version) if len(variantVersion) != 1 || variantVersion[0] < '0' || variantVersion[0] > '9' { |