android_app stl property bug fix

When it is set to c++_shared, the added dependency should be
libc++_shared, not libc++.

Fixes: 130891985
Test: app_test.go, atest 'CtsNdkBinderTestCases' w/ conversion CL
Change-Id: I0e50e0d5bf511aa6e52d16cd715a185721011255
This commit is contained in:
Jaewoong Jung
2019-06-04 11:53:47 -07:00
parent 22d3d6ba5c
commit 710756a6ff
4 changed files with 11 additions and 4 deletions

View File

@@ -175,7 +175,7 @@ func (a *AndroidApp) DepsMutator(ctx android.BottomUpMutatorContext) {
ctx.AddFarVariationDependencies(variation, tag, a.appProperties.Jni_libs...)
if String(a.appProperties.Stl) == "c++_shared" {
if embedJni {
ctx.AddFarVariationDependencies(variation, tag, "libc++")
ctx.AddFarVariationDependencies(variation, tag, "ndk_libc++_shared")
}
}
}