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

Merge "Apply sdk version check to product apps" am: 9948420715 am: b5d2fc7a31

Browse Source 
Change-Id: Id846946468dee66336b139382fe866729f48c38c
This commit is contained in:
Automerger Merge Worker
2020-03-10 02:06:11 +00:00
parent f39cf110ac b5d2fc7a31
commit ba104ae75d
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
java/sdk.go
View File

@@ -282,6 +282,28 @@ func sdkSpecFrom(str string) sdkSpec {
} }
} }
func (s sdkSpec) validateSystemSdk(ctx android.EarlyModuleContext) bool {
// Ensures that the specified system SDK version is one of BOARD_SYSTEMSDK_VERSIONS (for vendor/product Java module)
// Assuming that BOARD_SYSTEMSDK_VERSIONS := 28 29,
// sdk_version of the modules in vendor/product that use system sdk must be either system_28, system_29 or system_current
if s.kind != sdkSystem || !s.version.isNumbered() {
return true
}
allowedVersions := ctx.DeviceConfig().PlatformSystemSdkVersions()
if ctx.DeviceSpecific() || ctx.SocSpecific() || (ctx.ProductSpecific() && ctx.Config().EnforceProductPartitionInterface()) {
systemSdkVersions := ctx.DeviceConfig().SystemSdkVersions()
if len(systemSdkVersions) > 0 {
allowedVersions = systemSdkVersions
}
}
if len(allowedVersions) > 0 && !android.InList(s.version.String(), allowedVersions) {
ctx.PropertyErrorf("sdk_version", "incompatible sdk version %q. System SDK version should be one of %q",
s.raw, allowedVersions)
return false
}
return true
}
func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep { func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep {
sdkVersion := sdkContext.sdkVersion() sdkVersion := sdkContext.sdkVersion()
if !sdkVersion.valid() { if !sdkVersion.valid() {
@@ -292,6 +314,9 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep
if ctx.Config().IsPdkBuild() { if ctx.Config().IsPdkBuild() {
sdkVersion = sdkVersion.forPdkBuild(ctx) sdkVersion = sdkVersion.forPdkBuild(ctx)
} }
if !sdkVersion.validateSystemSdk(ctx) {
return sdkDep{}
}
if sdkVersion.usePrebuilt(ctx) { if sdkVersion.usePrebuilt(ctx) {
dir := filepath.Join("prebuilts", "sdk", sdkVersion.version.String(), sdkVersion.kind.String()) dir := filepath.Join("prebuilts", "sdk", sdkVersion.version.String(), sdkVersion.kind.String())
@@ -339,21 +364,6 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep
} }
} }
// Ensures that the specificed system SDK version is one of BOARD_SYSTEMSDK_VERSIONS (for vendor apks)
// or PRODUCT_SYSTEMSDK_VERSIONS (for other apks or when BOARD_SYSTEMSDK_VERSIONS is not set)
if sdkVersion.kind == sdkSystem && sdkVersion.version.isNumbered() {
allowed_versions := ctx.DeviceConfig().PlatformSystemSdkVersions()
if ctx.DeviceSpecific() || ctx.SocSpecific() {
if len(ctx.DeviceConfig().SystemSdkVersions()) > 0 {
allowed_versions = ctx.DeviceConfig().SystemSdkVersions()
}
}
if len(allowed_versions) > 0 && !android.InList(sdkVersion.version.String(), allowed_versions) {
ctx.PropertyErrorf("sdk_version", "incompatible sdk version %q. System SDK version should be one of %q",
sdkVersion.raw, allowed_versions)
}
}
switch sdkVersion.kind { switch sdkVersion.kind {
case sdkPrivate: case sdkPrivate:
return sdkDep{ return sdkDep{