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

Merge "Call shouldEmbedJnis only when needed."

Browse Source
This commit is contained in:
Jaewoong Jung
2019-11-06 21:50:05 +00:00
committed by Gerrit Code Review
parent 75c82fb518 9a9d0361bf
commit c6f22282ff
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/app.go
View File

@@ -165,7 +165,6 @@ func (a *AndroidApp) DepsMutator(ctx android.BottomUpMutatorContext) {
a.aapt.deps(ctx, sdkDep) a.aapt.deps(ctx, sdkDep)
} }
embedJni := a.shouldEmbedJnis(ctx)
for _, jniTarget := range ctx.MultiTargets() { for _, jniTarget := range ctx.MultiTargets() {
variation := append(jniTarget.Variations(), variation := append(jniTarget.Variations(),
blueprint.Variation{Mutator: "link", Variation: "shared"}) blueprint.Variation{Mutator: "link", Variation: "shared"})
@@ -174,7 +173,7 @@ func (a *AndroidApp) DepsMutator(ctx android.BottomUpMutatorContext) {
} }
ctx.AddFarVariationDependencies(variation, tag, a.appProperties.Jni_libs...) ctx.AddFarVariationDependencies(variation, tag, a.appProperties.Jni_libs...)
if String(a.appProperties.Stl) == "c++_shared" { if String(a.appProperties.Stl) == "c++_shared" {
if embedJni { if a.shouldEmbedJnis(ctx) {
ctx.AddFarVariationDependencies(variation, tag, "ndk_libc++_shared") ctx.AddFarVariationDependencies(variation, tag, "ndk_libc++_shared")
} }
} }