diff options
| author | Justin Yun <justinyun@google.com> | 2020-02-06 16:53:08 +0900 |
|---|---|---|
| committer | Justin Yun <justinyun@google.com> | 2020-02-10 19:14:58 +0000 |
| commit | 089c1357c6e5457a7bd5e76f70cead52517d9b0b (patch) | |
| tree | 6dcf1a604aa163515b5e04280bfe6188dab93eec /libnativeloader/native_loader_test.cpp | |
| parent | 860ab3748c3d112eec41abb57c801bb4f150521d (diff) | |
Use product vndk version for product apps
ro.vndk.version is only for vendor modules. Product modules use
different vndk version that is set in ro.product.vndk.version.
Use product vndk version for creating namespaces for product apps.
Bug: 148823287
Test: atest libnativeloader_test
Change-Id: Iade4b3ca846f1e47e5138f2ceda81bf188276a91
Diffstat (limited to 'libnativeloader/native_loader_test.cpp')
| -rw-r--r-- | libnativeloader/native_loader_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp index 46483773e6..e73af6d084 100644 --- a/libnativeloader/native_loader_test.cpp +++ b/libnativeloader/native_loader_test.cpp @@ -477,7 +477,7 @@ TEST_P(NativeLoaderTest_Create, UnbundledVendorApp) { expected_library_path = expected_library_path + ":/vendor/" LIB_DIR; expected_permitted_path = expected_permitted_path + ":/vendor/" LIB_DIR; expected_shared_libs_to_platform_ns = - expected_shared_libs_to_platform_ns + ":" + llndk_libraries(); + expected_shared_libs_to_platform_ns + ":" + llndk_libraries_vendor(); expected_link_with_vndk_ns = true; SetExpectations(); RunTest(); @@ -503,7 +503,7 @@ TEST_P(NativeLoaderTest_Create, UnbundledProductApp) { expected_permitted_path = expected_permitted_path + ":/product/" LIB_DIR ":/system/product/" LIB_DIR; expected_shared_libs_to_platform_ns = - expected_shared_libs_to_platform_ns + ":" + llndk_libraries(); + expected_shared_libs_to_platform_ns + ":" + llndk_libraries_product(); expected_link_with_vndk_ns = true; } SetExpectations(); |