StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove allowlist for updatable modules with current min_sdk_version" into main am: dd9b0c1be8 am: ff8b90d92e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3180441

Change-Id: Ibe54341384f6f36af3822fb8148e8a211bb0ddee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-07-19 17:45:27 +00:00
committed by Automerger Merge Worker
parent cc613f3ae2 ff8b90d92e
commit c156e5c955
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apex/apex.go
View File

@@ -2650,18 +2650,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. // checkUpdatable enforces APEX and its transitive dep properties to have desired values for updatable APEXes.
func (a *apexBundle) checkUpdatable(ctx android.ModuleContext) { func (a *apexBundle) checkUpdatable(ctx android.ModuleContext) {
if a.Updatable() { if a.Updatable() {
if a.minSdkVersionValue(ctx) == "" { if a.minSdkVersionValue(ctx) == "" {
ctx.PropertyErrorf("updatable", "updatable APEXes should set min_sdk_version as well") 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") 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() { if a.UsePlatformApis() {