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

Merge "enforce updatable apexes to set min_sdk_version" am: 4783297585 am: 09ae364a54

Browse Source 
Change-Id: I2b2ce7dfb1dfc9cf498a7ed26a158a61548016c0
This commit is contained in:
Treehugger Robot
2020-04-27 10:20:32 +00:00
committed by Automerger Merge Worker
parent cd5b550fdf 09ae364a54
commit 35d20b1a4f
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apex/apex.go
View File

@@ -1025,8 +1025,10 @@ type apexBundleProperties struct {
IsCoverageVariant bool `blueprint:"mutated"`
// Whether this APEX is considered updatable or not. When set to true, this will enforce additional
// rules for making sure that the APEX is truely updatable. This will also disable the size optimizations
// like symlinking to the system libs. Default is false.
// rules for making sure that the APEX is truly updatable.
// - To be updatable, min_sdk_version should be set as well
// This will also disable the size optimizations like symlinking to the system libs.
// Default is false.
Updatable *bool
// The minimum SDK version that this apex must be compatibile with.
@@ -1798,6 +1800,14 @@ func (a *apexBundle) checkApexAvailability(ctx android.ModuleContext) {
})
}
func (a *apexBundle) checkUpdatable(ctx android.ModuleContext) {
if proptools.Bool(a.properties.Updatable) {
if String(a.properties.Min_sdk_version) == "" {
ctx.PropertyErrorf("updatable", "updatable APEXes should set min_sdk_version as well")
}
}
}
// Collects the list of module names that directly or indirectly contributes to the payload of this APEX
func (a *apexBundle) collectDepsInfo(ctx android.ModuleContext) {
a.depInfos = make(map[string]depInfo)
@@ -1863,6 +1873,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
a.checkApexAvailability(ctx)
a.checkUpdatable(ctx)
a.collectDepsInfo(ctx)