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
diff --git a/java/app.go b/java/app.go
index 2d817fe..8624a74 100644
--- a/java/app.go
+++ b/java/app.go
@@ -175,7 +175,7 @@
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")
}
}
}
diff --git a/java/app_test.go b/java/app_test.go
index 559afcc..ac40ece 100644
--- a/java/app_test.go
+++ b/java/app_test.go
@@ -1199,6 +1199,10 @@
compile_multilib: "both",
sdk_version: "current",
}
+
+ ndk_prebuilt_shared_stl {
+ name: "ndk_libc++_shared",
+ }
`)
testCases := []struct {
@@ -1208,7 +1212,7 @@
{"stl",
[]string{
"libjni.so",
- "libc++.so",
+ "libc++_shared.so",
},
},
{"system",
diff --git a/java/java_test.go b/java/java_test.go
index 3a7ed4e..4d161c5 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -105,6 +105,7 @@
ctx.RegisterModuleType("cc_object", android.ModuleFactoryAdaptor(cc.ObjectFactory))
ctx.RegisterModuleType("toolchain_library", android.ModuleFactoryAdaptor(cc.ToolchainLibraryFactory))
ctx.RegisterModuleType("llndk_library", android.ModuleFactoryAdaptor(cc.LlndkLibraryFactory))
+ ctx.RegisterModuleType("ndk_prebuilt_shared_stl", android.ModuleFactoryAdaptor(cc.NdkPrebuiltSharedStlFactory))
ctx.PreDepsMutators(func(ctx android.RegisterMutatorsContext) {
ctx.BottomUp("link", cc.LinkageMutator).Parallel()
ctx.BottomUp("begin", cc.BeginMutator).Parallel()
@@ -134,6 +135,8 @@
"api/test-removed.txt": nil,
"framework/aidl/a.aidl": nil,
+ "prebuilts/ndk/current/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_shared.so": nil,
+
"prebuilts/sdk/14/public/android.jar": nil,
"prebuilts/sdk/14/public/framework.aidl": nil,
"prebuilts/sdk/14/system/android.jar": nil,