diff options
| author | 2024-12-02 23:21:31 +0000 | |
|---|---|---|
| committer | 2024-12-02 23:21:31 +0000 | |
| commit | 430bb2e2c93d440f76279a5a6f0f0d3cc3141e6c (patch) | |
| tree | a91ae61387d1c88299be8d2c094618a979db8848 /apex/apex_test.go | |
| parent | 6e0c11049d859040c125f19cfab01d473b4bd398 (diff) | |
Revert "Skip packaging cross container cc deps of apk-in-apex"
This reverts commit 6e0c11049d859040c125f19cfab01d473b4bd398.
Reason for revert: Droidmonitor created revert due to b/381931089. Will be verifying through ABTD before submission.
Change-Id: Id5cb534132c1db84cfda5f1da5c62c0a26bce19c
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 2ca74a604..5b5fe5ff1 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -12137,32 +12137,34 @@ func TestApexVerifyNativeImplementationLibs(t *testing.T) { }, dependencyPath: []string{"myapex", "libjni", "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"}, - }, + // 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: "binary dependency in other apex", bpModifier: addToSharedLibs("mybin", "libotherapex#impl"), |