diff options
author | Colin Cross <ccross@android.com> | 2019-03-26 10:51:39 -0700 |
---|---|---|
committer | Jaewoong Jung <jungjw@google.com> | 2019-03-27 15:09:52 +0000 |
commit | 47fa9d3d83fbafd56723907b23e45ed026ea7a10 (patch) | |
tree | 9cbffe576842d90d59d32fd9ed64638215a77826 /java/java_test.go | |
parent | c7dd408f890cd03f3f0bfdf2df8002fc7497ccf8 (diff) |
Always package JNI libs into android_test modules
android_test modules should always have native libraries packaged
into the APK even when use_embedded_native_libs: false is set.
Fixes: 129298278
Test: TestJNIPackaging
Change-Id: Idfcc630f7c6579c1280a920b5d71808b0a502e06
Diffstat (limited to 'java/java_test.go')
-rw-r--r-- | java/java_test.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/java_test.go b/java/java_test.go index ec6d27a89..6cb481865 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -103,6 +103,7 @@ func testContext(config android.Config, bp string, ctx.RegisterModuleType("cc_library", android.ModuleFactoryAdaptor(cc.LibraryFactory)) 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.PreDepsMutators(func(ctx android.RegisterMutatorsContext) { ctx.BottomUp("link", cc.LinkageMutator).Parallel() ctx.BottomUp("begin", cc.BeginMutator).Parallel() |