commit e9b5db1cfee0f6f7c4ecae874e2460a8d7445268
author Satoshi Niwa <niwa@google.com> Wed Sep 14 17:47:54 2022 +0900
committer Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 15 23:20:03 2022 +0000
tree d019e7476078af59a3c9f21fd878a1b5c07d11ca
parent 43b3caaa018f9dd265ff47f756e07fb2bc7d1f2a

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

diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp
index b1a7e35..2fc2b4e 100644
--- a/libnativeloader/native_loader_test.cpp
+++ b/libnativeloader/native_loader_test.cpp
@@ -344,7 +344,7 @@
   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();
 }

libnativeloader/public_libraries.cpp

diff --git a/libnativeloader/public_libraries.cpp b/libnativeloader/public_libraries.cpp
index ffebe0b..433a909 100644
--- a/libnativeloader/public_libraries.cpp
+++ b/libnativeloader/public_libraries.cpp
@@ -212,6 +212,9 @@
 }
 
 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 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);