diff options
| author | 2024-03-07 01:21:19 +0000 | |
|---|---|---|
| committer | 2024-03-07 01:21:19 +0000 | |
| commit | 2344159609d66cb5eef86636cda54454bdc335f3 (patch) | |
| tree | 492e5023a350b064cb53df9e1d025cbb36686c82 /libnativeloader/native_loader_test.cpp | |
| parent | 6028078cb369ee8c8a05dbde7a2cb7d30ae25379 (diff) | |
| parent | ff6f11363078d2449a9b93e6ba299751e2779884 (diff) | |
Do not expect VNDK namespace when VNDK is deprecated am: 1cffc693d9 am: e3627282a2 am: ff6f113630
Original change: https://android-review.googlesource.com/c/platform/art/+/2981554
Change-Id: I998c3ce003fc42d887c63400d189e356b508a263
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(); |