diff options
| author | 2019-06-05 13:47:32 -0700 | |
|---|---|---|
| committer | 2019-06-05 13:47:32 -0700 | |
| commit | 6a98d5d59b2a6060f51890157ec90a61b77559b1 (patch) | |
| tree | dbb4249cb7fa5bb3a571b75f5f93e1f333b3b1da /java/java_test.go | |
| parent | f6a2a5b960e605a9af35df63bcd3771bf4650b6e (diff) | |
| parent | 58d0f0cf69857f1ad356dac72dbfc190b0effcb1 (diff) | |
Merge "android_app stl property bug fix" am: 4f67c42d76
am: 58d0f0cf69
Change-Id: Ic14f463f27b8413e0d4960658c41407763d79ba6
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/java_test.go b/java/java_test.go index 00b76e97f..1d22dae88 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, |