diff options
| author | 2024-03-06 23:53:29 +0000 | |
|---|---|---|
| committer | 2024-03-06 23:53:29 +0000 | |
| commit | 9da5bba7cfd85ae32a207b190789af4b2c1aa06e (patch) | |
| tree | 8343b46505507068b8cda670fa19e9f7f81e385e /libnativeloader/native_loader_test.cpp | |
| parent | 8af6a618ffd5f40165f67647dee9435f9a8ce6fb (diff) | |
| parent | 96d09a108d67d8cc07fed6c499e7fa3901c57446 (diff) | |
Use product vndk version to check if product vndk is deprecated am: 96d09a108d
Original change: https://android-review.googlesource.com/c/platform/art/+/2981552
Change-Id: Ia9c57d58477c20d63b0296e41ad1cae2d1712f74
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 | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp index 6c0c8b17a7..62fb1eef2b 100644 --- a/libnativeloader/native_loader_test.cpp +++ b/libnativeloader/native_loader_test.cpp @@ -378,15 +378,14 @@ TEST_P(NativeLoaderTest_Create, UnbundledProductApp) { dex_path = "/product/app/foo/foo.apk"; is_shared = false; - if (is_product_vndk_version_defined()) { - expected_namespace_prefix = "product-clns"; - expected_library_path = expected_library_path + ":/product/" LIB_DIR ":/system/product/" LIB_DIR; - expected_permitted_path = - 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; - } + expected_namespace_prefix = "product-clns"; + expected_library_path = expected_library_path + ":/product/" LIB_DIR ":/system/product/" LIB_DIR; + expected_permitted_path = + 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; + SetExpectations(); RunTest(); } |