Merge "Always package JNI libs into android_test modules" am: eae12cf400 am: f394fb0a27

am: b1af785608

Change-Id: I73d8243ae1bd428098f4f60b4a22c9b50785c481
This commit is contained in:
Colin Cross
2019-03-27 09:07:26 -07:00
committed by android-build-merger
3 changed files with 98 additions and 45 deletions

View File

@@ -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()