Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f8cdab4 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge changes from topic "apk-jni-enforce" into rvc-dev am: de58c39b

Change-Id: Ib9926e6b172d5250a57a6d7c9f8860ec3abdfebe
parents 3c3b9809 de58c39b
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -445,8 +445,11 @@ func (a *AndroidApp) checkJniLibsSdkVersion(ctx android.ModuleContext, minSdkVer
			return
		}
		dep, _ := m.(*cc.Module)
		jniSdkVersion, err := android.ApiStrToNum(ctx, dep.SdkVersion())
		if err != nil || int(minSdkVersion) < jniSdkVersion {
		// The domain of cc.sdk_version is "current" and <number>
		// 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)",
				dep.SdkVersion(), minSdkVersion, ctx.ModuleName())
			return