From 32c93a3f3c114b7edb4b17b41a0939a7003ded18 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Wed, 17 Jul 2024 20:31:58 +0000 Subject: [PATCH] Remove allowlist for updatable modules with current min_sdk_version All existing violations have been cleaned up. Bug: 221087384 Test: presbumits Change-Id: Iefe318d9372d4078f21b03e0d9003609cca069ab --- apex/apex.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/apex/apex.go b/apex/apex.go index f9b30d4b6..53a30e734 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -2663,18 +2663,13 @@ func (a *apexBundle) checkStaticLinkingToStubLibraries(ctx android.ModuleContext }) } -// TODO (b/221087384): Remove this allowlist -var ( - updatableApexesWithCurrentMinSdkVersionAllowlist = []string{"com.android.profiling"} -) - // checkUpdatable enforces APEX and its transitive dep properties to have desired values for updatable APEXes. func (a *apexBundle) checkUpdatable(ctx android.ModuleContext) { if a.Updatable() { if a.minSdkVersionValue(ctx) == "" { ctx.PropertyErrorf("updatable", "updatable APEXes should set min_sdk_version as well") } - if a.minSdkVersion(ctx).IsCurrent() && !android.InList(ctx.ModuleName(), updatableApexesWithCurrentMinSdkVersionAllowlist) { + if a.minSdkVersion(ctx).IsCurrent() { ctx.PropertyErrorf("updatable", "updatable APEXes should not set min_sdk_version to current. Please use a finalized API level or a recognized in-development codename") } if a.UsePlatformApis() {