From 47fa9d3d83fbafd56723907b23e45ed026ea7a10 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 26 Mar 2019 10:51:39 -0700 Subject: 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 --- java/java_test.go | 1 + 1 file changed, 1 insertion(+) (limited to 'java/java_test.go') 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() -- cgit v1.2.3-59-g8ed1b