diff options
| author | 2024-03-07 00:34:43 +0000 | |
|---|---|---|
| committer | 2024-03-07 00:34:43 +0000 | |
| commit | ff6f11363078d2449a9b93e6ba299751e2779884 (patch) | |
| tree | 7d918903ccf77c80335f770a6b91658987ca0b14 /libnativeloader/native_loader_test.cpp | |
| parent | bb8c3b863d4a416f01a58087d29cfa667d20a622 (diff) | |
| parent | e3627282a28e3a84884df867b0c177a5243ae74f (diff) | |
Do not expect VNDK namespace when VNDK is deprecated am: 1cffc693d9 am: e3627282a2
Original change: https://android-review.googlesource.com/c/platform/art/+/2981554
Change-Id: I9e66b96f07ab75bccadbece45976603a492040c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libnativeloader/native_loader_test.cpp')
| -rw-r--r-- | libnativeloader/native_loader_test.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp index 547fded4b4..72348ed364 100644 --- a/libnativeloader/native_loader_test.cpp +++ b/libnativeloader/native_loader_test.cpp @@ -348,7 +348,9 @@ TEST_P(NativeLoaderTest_Create, UnbundledVendorApp) { expected_permitted_path = expected_permitted_path + ":/vendor/" LIB_DIR; expected_shared_libs_to_platform_ns = default_public_libraries() + ":" + llndk_libraries_vendor(); - expected_link_with_vndk_ns = true; + if (android::base::GetProperty("ro.vndk.version", "") != "") { + expected_link_with_vndk_ns = true; + } SetExpectations(); RunTest(); } @@ -386,7 +388,9 @@ TEST_P(NativeLoaderTest_Create, UnbundledProductApp) { expected_permitted_path + ":/product/" LIB_DIR ":/system/product/" LIB_DIR; expected_shared_libs_to_platform_ns = append_extended_libraries(default_public_libraries() + ":" + llndk_libraries_product()); - expected_link_with_vndk_product_ns = true; + if (android::base::GetProperty("ro.product.vndk.version", "") != "") { + expected_link_with_vndk_product_ns = true; + } } SetExpectations(); |