commit cbef1731dc1d2674e564d062b71bd1abe5529295
author Justin Yun <justinyun@google.com> Tue Mar 24 13:31:19 2020 +0900
committer Justin Yun <justinyun@google.com> Tue Mar 24 14:08:49 2020 +0900
tree 1cfbea836b61e77caa690445450acdb284e8b116
parent cc2b3d6333c476c73175803371308adbbee257e1

Skip reading VNDK libs for product if not available

If a device do not define "ro.product.vndk.version", we don't need to
initialize the VNDK libraries for them. In that case, return emtpy
string.

Bug: 151992099
Test: atest libnativeloader_test
Change-Id: Ic4d5e0e1162d367e919b5381e3a6c7d048a5e103
Merged-In: Ic4d5e0e1162d367e919b5381e3a6c7d048a5e103

libnativeloader/public_libraries.cpp

diff --git a/libnativeloader/public_libraries.cpp b/libnativeloader/public_libraries.cpp
index 157ace5..a9d4e4d 100644
--- a/libnativeloader/public_libraries.cpp
+++ b/libnativeloader/public_libraries.cpp
@@ -267,6 +267,9 @@
 }
 
 static std::string InitLlndkLibrariesProduct() {
+  if (!is_product_vndk_version_defined()) {
+    return "";
+  }
   std::string config_file = kLlndkLibrariesFile;
   InsertVndkVersionStr(&config_file, true);
   auto sonames = ReadConfig(config_file, always_true);
@@ -289,6 +292,9 @@
 }
 
 static std::string InitVndkspLibrariesProduct() {
+  if (!is_product_vndk_version_defined()) {
+    return "";
+  }
   std::string config_file = kVndkLibrariesFile;
   InsertVndkVersionStr(&config_file, true);
   auto sonames = ReadConfig(config_file, always_true);