diff options
| author | 2024-11-13 16:44:08 +0000 | |
|---|---|---|
| committer | 2024-11-13 16:44:08 +0000 | |
| commit | 3583edd77ea757a1324825a9e61614554cc469f1 (patch) | |
| tree | d71b78e933a373b082b6b515e02c900f0a1be731 /apex/apex_test.go | |
| parent | 8ac00ca75bfbccee0862035226c8ac26b47d264f (diff) | |
| parent | 8ffb90f6da1c939a9f6041013d88b71dab7ab88f (diff) | |
Merge "Don't magically use implementations for modules in the same apex" into main am: 8ffb90f6da
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3336700
Change-Id: Ic5cc3e7c42cef182f2beaa15b68d4134e8b85fd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 17cea5e09..d0494d67d 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -929,7 +929,7 @@ func TestApexWithStubs(t *testing.T) { cc_library { name: "mylib", srcs: ["mylib.cpp"], - shared_libs: ["mylib2", "mylib3", "my_prebuilt_platform_lib", "my_prebuilt_platform_stub_only_lib"], + shared_libs: ["mylib2", "mylib3#impl", "my_prebuilt_platform_lib", "my_prebuilt_platform_stub_only_lib"], system_shared_libs: [], stl: "none", apex_available: [ "myapex" ], @@ -1025,7 +1025,7 @@ func TestApexWithStubs(t *testing.T) { // ... and not linking to the non-stub (impl) variant of mylib2 ensureNotContains(t, mylibLdFlags, "mylib2/android_arm64_armv8-a_shared/mylib2.so") - // Ensure that mylib is linking with the non-stub (impl) of mylib3 (because mylib3 is in the same apex) + // Ensure that mylib is linking with the non-stub (impl) of mylib3 (because the dependency is added with mylib3#impl) ensureContains(t, mylibLdFlags, "mylib3/android_arm64_armv8-a_shared_apex10000/mylib3.so") // .. and not linking to the stubs variant of mylib3 ensureNotContains(t, mylibLdFlags, "mylib3/android_arm64_armv8-a_shared_12/mylib3.so") @@ -1201,7 +1201,7 @@ func TestApexWithStubsWithMinSdkVersion(t *testing.T) { cc_library { name: "mylib", srcs: ["mylib.cpp"], - shared_libs: ["mylib2", "mylib3"], + shared_libs: ["mylib2", "mylib3#impl"], system_shared_libs: [], stl: "none", apex_available: [ "myapex" ], @@ -1264,7 +1264,7 @@ func TestApexWithStubsWithMinSdkVersion(t *testing.T) { // ... and not linking to the non-stub (impl) variant of mylib2 ensureNotContains(t, mylibLdFlags, "mylib2/android_arm64_armv8-a_shared/mylib2.so") - // Ensure that mylib is linking with the non-stub (impl) of mylib3 (because mylib3 is in the same apex) + // Ensure that mylib is linking with the non-stub (impl) of mylib3 (because the dependency is added with mylib3#impl) ensureContains(t, mylibLdFlags, "mylib3/android_arm64_armv8-a_shared_apex29/mylib3.so") // .. and not linking to the stubs variant of mylib3 ensureNotContains(t, mylibLdFlags, "mylib3/android_arm64_armv8-a_shared_29/mylib3.so") @@ -1797,8 +1797,8 @@ func TestApexWithSystemLibsStubs(t *testing.T) { cc_library { name: "mylib", srcs: ["mylib.cpp"], - system_shared_libs: ["libc", "libm"], - shared_libs: ["libdl#27"], + system_shared_libs: ["libc"], + shared_libs: ["libdl#27", "libm#impl"], stl: "none", apex_available: [ "myapex" ], } @@ -2962,8 +2962,7 @@ func TestApexMinSdkVersion_OkayEvenWhenDepIsNewer_IfItSatisfiesApexMinSdkVersion private_key: "testkey.pem", } - // mylib in myapex will link to mylib2#current - // mylib in otherapex will link to mylib2(non-stub) in otherapex as well + // mylib will link to mylib2#current cc_library { name: "mylib", srcs: ["mylib.cpp"], @@ -2997,7 +2996,7 @@ func TestApexMinSdkVersion_OkayEvenWhenDepIsNewer_IfItSatisfiesApexMinSdkVersion ensureContains(t, libFlags, "android_arm64_armv8-a_"+to_variant+"/"+to+".so") } expectLink("mylib", "shared_apex29", "mylib2", "shared_current") - expectLink("mylib", "shared_apex30", "mylib2", "shared_apex30") + expectLink("mylib", "shared_apex30", "mylib2", "shared_current") } func TestApexMinSdkVersion_WorksWithSdkCodename(t *testing.T) { |