diff options
| author | 2024-12-10 15:14:11 +0000 | |
|---|---|---|
| committer | 2024-12-10 15:14:11 +0000 | |
| commit | 10fce427deabc68fe1c5846d01f7e7e581064fab (patch) | |
| tree | d40ef1536967ef5a21b2ebf037d519fcfe03c23b /apex/builder.go | |
| parent | d5dbf502668f676c4fe89a91a5eaaeb4e1638176 (diff) | |
| parent | 110e0a8ff28d44c041226715f83182e7bb6a9e23 (diff) | |
Merge "Include 9 as the last allowed digit of default version code." into main am: 110e0a8ff2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3398639
Change-Id: I748dbf934e66076a7b794c7b42363ab5a29090ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apex/builder.go')
| -rw-r--r-- | apex/builder.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apex/builder.go b/apex/builder.go index e522ab665..a3343c338 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -337,8 +337,8 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs, if err != nil { ctx.ModuleErrorf("expected RELEASE_DEFAULT_UPDATABLE_MODULE_VERSION to be an int, but got %s", defaultVersion) } - if defaultVersionInt%10 != 0 { - ctx.ModuleErrorf("expected RELEASE_DEFAULT_UPDATABLE_MODULE_VERSION to end in a zero, but got %s", defaultVersion) + if defaultVersionInt%10 != 0 && defaultVersionInt%10 != 9 { + ctx.ModuleErrorf("expected RELEASE_DEFAULT_UPDATABLE_MODULE_VERSION to end in a zero or a nine, but got %s", defaultVersion) } variantVersion := []rune(*a.properties.Variant_version) if len(variantVersion) != 1 || variantVersion[0] < '0' || variantVersion[0] > '9' { |