diff options
Diffstat (limited to 'libnativeloader')
| -rw-r--r-- | libnativeloader/native_loader_test.cpp | 2 | ||||
| -rw-r--r-- | libnativeloader/public_libraries.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp index b1a7e3538a..2fc2b4ec81 100644 --- a/libnativeloader/native_loader_test.cpp +++ b/libnativeloader/native_loader_test.cpp @@ -344,7 +344,7 @@ 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; + expected_link_with_vndk_ns = !get_vndk_version(/*is_product_vndk=*/false).empty(); SetExpectations(); RunTest(); } diff --git a/libnativeloader/public_libraries.cpp b/libnativeloader/public_libraries.cpp index ffebe0b4c7..433a9095ef 100644 --- a/libnativeloader/public_libraries.cpp +++ b/libnativeloader/public_libraries.cpp @@ -212,6 +212,9 @@ static std::string InitExtendedPublicLibraries() { } static std::string InitLlndkLibrariesVendor() { + if (get_vndk_version(/*is_product_vndk=*/false).empty()) { + return ""; + } std::string config_file = kLlndkLibrariesFile; InsertVndkVersionStr(&config_file, false); auto sonames = ReadConfig(config_file, always_true); @@ -237,6 +240,9 @@ static std::string InitLlndkLibrariesProduct() { } static std::string InitVndkspLibrariesVendor() { + if (get_vndk_version(/*is_product_vndk=*/false).empty()) { + return ""; + } std::string config_file = kVndkLibrariesFile; InsertVndkVersionStr(&config_file, false); auto sonames = ReadConfig(config_file, always_true); |