diff options
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 54 |
1 files changed, 26 insertions, 28 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 27c0340de..282cd1dd3 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -12149,34 +12149,32 @@ func TestApexVerifyNativeImplementationLibs(t *testing.T) { }, dependencyPath: []string{"myapex", "libjni", "libbar", "libplatform"}, }, - // TODO: embedded JNI in apps should be checked too, but Soong currently just packages the transitive - // JNI libraries even if they came from another apex. - //{ - // name: "app jni library dependency in other apex", - // bpModifier: addToSharedLibs("libembeddedjni", "libotherapex#impl"), - // dependencyPath: []string{"myapex", "myapp", "libembeddedjni", "libotherapex"}, - //}, - //{ - // name: "transitive app jni library dependency in other apex", - // bpModifier: func(bp *bpmodify.Blueprint) { - // addToSharedLibs("libembeddedjni", "libbar")(bp) - // addToSharedLibs("libbar", "libotherapex#impl")(bp) - // }, - // dependencyPath: []string{"myapex", "myapp", "libembeddedjni", "libbar", "libotherapex"}, - //}, - //{ - // name: "app jni library dependency in platform", - // bpModifier: addToSharedLibs("libembeddedjni", "libplatform#impl"), - // dependencyPath: []string{"myapex", "myapp", "libembeddedjni", "libplatform"}, - //}, - //{ - // name: "transitive app jni library dependency in platform", - // bpModifier: func(bp *bpmodify.Blueprint) { - // addToSharedLibs("libembeddedjni", "libbar")(bp) - // addToSharedLibs("libbar", "libplatform#impl")(bp) - // }, - // dependencyPath: []string{"myapex", "myapp", "libembeddedjni", "libbar", "libplatform"}, - //}, + { + name: "app jni library dependency in other apex", + bpModifier: addToSharedLibs("libembeddedjni", "libotherapex#impl"), + dependencyPath: []string{"myapex", "myapp", "libembeddedjni", "libotherapex"}, + }, + { + name: "transitive app jni library dependency in other apex", + bpModifier: func(bp *bpmodify.Blueprint) { + addToSharedLibs("libembeddedjni", "libbar")(bp) + addToSharedLibs("libbar", "libotherapex#impl")(bp) + }, + dependencyPath: []string{"myapex", "myapp", "libembeddedjni", "libbar", "libotherapex"}, + }, + { + name: "app jni library dependency in platform", + bpModifier: addToSharedLibs("libembeddedjni", "libplatform#impl"), + dependencyPath: []string{"myapex", "myapp", "libembeddedjni", "libplatform"}, + }, + { + name: "transitive app jni library dependency in platform", + bpModifier: func(bp *bpmodify.Blueprint) { + addToSharedLibs("libembeddedjni", "libbar")(bp) + addToSharedLibs("libbar", "libplatform#impl")(bp) + }, + dependencyPath: []string{"myapex", "myapp", "libembeddedjni", "libbar", "libplatform"}, + }, { name: "binary dependency in other apex", bpModifier: addToSharedLibs("mybin", "libotherapex#impl"), |