diff options
| author | 2019-06-05 13:37:36 -0700 | |
|---|---|---|
| committer | 2019-06-05 13:37:36 -0700 | |
| commit | 58d0f0cf69857f1ad356dac72dbfc190b0effcb1 (patch) | |
| tree | f993de235c0dbdf8a2b266e02bfaf22ab570ad6d | |
| parent | edff7ed8da74497cd109338ae8622f94f201d917 (diff) | |
| parent | 4f67c42d7637fd28242e7fab20c6a7099de2c03c (diff) | |
Merge "android_app stl property bug fix"
am: 4f67c42d76
Change-Id: I977fa1fcd8c73495447b208a7289ba4a9a97d575
| -rw-r--r-- | cc/ndk_prebuilt.go | 4 | ||||
| -rw-r--r-- | java/app.go | 2 | ||||
| -rw-r--r-- | java/app_test.go | 6 | ||||
| -rw-r--r-- | java/java_test.go | 3 |
4 files changed, 11 insertions, 4 deletions
diff --git a/cc/ndk_prebuilt.go b/cc/ndk_prebuilt.go index 026ff220a..fb168872b 100644 --- a/cc/ndk_prebuilt.go +++ b/cc/ndk_prebuilt.go @@ -25,7 +25,7 @@ import ( func init() { android.RegisterModuleType("ndk_prebuilt_object", ndkPrebuiltObjectFactory) android.RegisterModuleType("ndk_prebuilt_static_stl", ndkPrebuiltStaticStlFactory) - android.RegisterModuleType("ndk_prebuilt_shared_stl", ndkPrebuiltSharedStlFactory) + android.RegisterModuleType("ndk_prebuilt_shared_stl", NdkPrebuiltSharedStlFactory) } // NDK prebuilt libraries. @@ -107,7 +107,7 @@ func (*ndkPrebuiltStlLinker) linkerDeps(ctx DepsContext, deps Deps) Deps { // library (stl) library for linking operation. The soong's module name format // is ndk_<NAME>.so where the library is located under // ./prebuilts/ndk/current/sources/cxx-stl/llvm-libc++/libs/$(HOST_ARCH)/<NAME>.so. -func ndkPrebuiltSharedStlFactory() android.Module { +func NdkPrebuiltSharedStlFactory() android.Module { module, library := NewLibrary(android.DeviceSupported) library.BuildOnlyShared() module.compiler = nil diff --git a/java/app.go b/java/app.go index 2d817fe58..8624a7422 100644 --- a/java/app.go +++ b/java/app.go @@ -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") } } } diff --git a/java/app_test.go b/java/app_test.go index 9aedebd76..0f2c1cf9c 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -1203,6 +1203,10 @@ func TestStl(t *testing.T) { compile_multilib: "both", sdk_version: "current", } + + ndk_prebuilt_shared_stl { + name: "ndk_libc++_shared", + } `) testCases := []struct { @@ -1212,7 +1216,7 @@ func TestStl(t *testing.T) { {"stl", []string{ "libjni.so", - "libc++.so", + "libc++_shared.so", }, }, {"system", diff --git a/java/java_test.go b/java/java_test.go index 3a7ed4e3f..4d161c5ac 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -105,6 +105,7 @@ func testContext(config android.Config, bp string, 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 @@ func testContext(config android.Config, bp string, "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, |