diff options
Diffstat (limited to 'java/app.go')
| -rwxr-xr-x | java/app.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/java/app.go b/java/app.go index 0a4d9e4ea..6a0aa8f41 100755 --- a/java/app.go +++ b/java/app.go @@ -214,6 +214,13 @@ func (a *AndroidApp) DepsMutator(ctx android.BottomUpMutatorContext) { for _, jniTarget := range ctx.MultiTargets() { variation := append(jniTarget.Variations(), blueprint.Variation{Mutator: "link", Variation: "shared"}) + + // If the app builds against an Android SDK use the SDK variant of JNI dependencies + // unless jni_uses_platform_apis is set. + if a.sdkVersion().specified() && a.sdkVersion().kind != sdkCorePlatform && + !Bool(a.appProperties.Jni_uses_platform_apis) { + variation = append(variation, blueprint.Variation{Mutator: "sdk", Variation: "sdk"}) + } ctx.AddFarVariationDependencies(variation, tag, a.appProperties.Jni_libs...) } |