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

Merge "Use sdkSpec to compare sdk_versions of APK/JNI"

Browse Source
This commit is contained in:
Treehugger Robot
2020-06-08 07:27:26 +00:00
committed by Gerrit Code Review
parent 37ed5063e2 652d5b31ef
commit 8a624337b3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/app.go
View File

@@ -445,8 +445,11 @@ func (a *AndroidApp) checkJniLibsSdkVersion(ctx android.ModuleContext, minSdkVer
return return
} }
dep, _ := m.(*cc.Module) dep, _ := m.(*cc.Module)
jniSdkVersion, err := android.ApiStrToNum(ctx, dep.SdkVersion()) // The domain of cc.sdk_version is "current" and <number>
if err != nil || int(minSdkVersion) < jniSdkVersion { // We can rely on sdkSpec to convert it to <number> so that "current" is handled
// properly regardless of sdk finalization.
jniSdkVersion, err := sdkSpecFrom(dep.SdkVersion()).effectiveVersion(ctx)
if err != nil || minSdkVersion < jniSdkVersion {
ctx.OtherModuleErrorf(dep, "sdk_version(%v) is higher than min_sdk_version(%v) of the containing android_app(%v)", ctx.OtherModuleErrorf(dep, "sdk_version(%v) is higher than min_sdk_version(%v) of the containing android_app(%v)",
dep.SdkVersion(), minSdkVersion, ctx.ModuleName()) dep.SdkVersion(), minSdkVersion, ctx.ModuleName())
return return