From 0c89ca3fef13c86043ebb77c749ef74676943650 Mon Sep 17 00:00:00 2001 From: Alyssa Ketpreechasawat Date: Sun, 8 Dec 2024 21:15:25 +0000 Subject: Include 9 as the last allowed digit of default version code. Due to go/aml-default-version-code, we are required to use the last digit for version code as 9. Bug: 381839073 Test: presubmit Test: adb install Change-Id: Ia3534d687541a85042a328c307daf78b294b5d89 --- apex/builder.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apex/builder.go') diff --git a/apex/builder.go b/apex/builder.go index e5ae10622..2b711a109 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' { -- cgit v1.2.3-59-g8ed1b