From e9b5db1cfee0f6f7c4ecae874e2460a8d7445268 Mon Sep 17 00:00:00 2001
From: Satoshi Niwa <niwa@google.com>
Date: Wed, 14 Sep 2022 17:47:54 +0900
Subject: RESTRICT AUTOMERGE: libnativeloader_test: Skip reading VNDK libs for
 vendor if not available

(Using Merged-In with an ID of a recent ART CL to avoid merging into master.)

Bug: 235217081
Test: atest libnativeloader_test
Change-Id: I8e6965189e9df3ba20ff3ddc22f74f0e23e7a1ee
Merged-In: I1400a701a622f9f35b3ce0781575134faca679ae
---
 libnativeloader/native_loader_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libnativeloader/native_loader_test.cpp')

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();
 }
-- 
cgit v1.2.3-59-g8ed1b