commit 089c1357c6e5457a7bd5e76f70cead52517d9b0b
author Justin Yun <justinyun@google.com> Thu Feb 06 16:53:08 2020 +0900
committer Justin Yun <justinyun@google.com> Mon Feb 10 19:14:58 2020 +0000
tree 6dcf1a604aa163515b5e04280bfe6188dab93eec
parent 860ab3748c3d112eec41abb57c801bb4f150521d

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

libnativeloader/public_libraries.cpp

diff --git a/libnativeloader/public_libraries.cpp b/libnativeloader/public_libraries.cpp
index 5cdfa94..a1fc4c5 100644
--- a/libnativeloader/public_libraries.cpp
+++ b/libnativeloader/public_libraries.cpp
@@ -74,8 +74,8 @@
   return debuggable;
 }
 
-std::string vndk_version_str() {
-  static std::string version = android::base::GetProperty("ro.vndk.version", "");
+std::string vndk_version_str(bool use_product_vndk) {
+  static std::string version = get_vndk_version(use_product_vndk);
   if (version != "" && version != "current") {
     return "." + version;
   }
@@ -92,13 +92,13 @@
   return "";
 }
 
-void InsertVndkVersionStr(std::string* file_name) {
+void InsertVndkVersionStr(std::string* file_name, bool use_product_vndk) {
   CHECK(file_name != nullptr);
   size_t insert_pos = file_name->find_last_of(".");
   if (insert_pos == std::string::npos) {
     insert_pos = file_name->length();
   }
-  file_name->insert(insert_pos, vndk_version_str());
+  file_name->insert(insert_pos, vndk_version_str(use_product_vndk));
 }
 
 const std::function<Result<bool>(const struct ConfigEntry&)> always_true =
@@ -250,9 +250,20 @@
   return android::base::Join(sonames, ':');
 }
 
-static std::string InitLlndkLibraries() {
+static std::string InitLlndkLibrariesVendor() {
   std::string config_file = kLlndkLibrariesFile;
-  InsertVndkVersionStr(&config_file);
+  InsertVndkVersionStr(&config_file, false);
+  auto sonames = ReadConfig(config_file, always_true);
+  if (!sonames) {
+    LOG_ALWAYS_FATAL("%s", sonames.error().message().c_str());
+    return "";
+  }
+  return android::base::Join(*sonames, ':');
+}
+
+static std::string InitLlndkLibrariesProduct() {
+  std::string config_file = kLlndkLibrariesFile;
+  InsertVndkVersionStr(&config_file, true);
   auto sonames = ReadConfig(config_file, always_true);
   if (!sonames.ok()) {
     LOG_ALWAYS_FATAL("%s", sonames.error().message().c_str());
@@ -262,8 +273,10 @@
 }
 
 static std::string InitVndkspLibraries() {
+  // VNDK-SP is used only for vendor hals which are not available for the
+  // product partition.
   std::string config_file = kVndkLibrariesFile;
-  InsertVndkVersionStr(&config_file);
+  InsertVndkVersionStr(&config_file, false);
   auto sonames = ReadConfig(config_file, always_true);
   if (!sonames.ok()) {
     LOG_ALWAYS_FATAL("%s", sonames.error().message().c_str());
@@ -317,8 +330,13 @@
   return list;
 }
 
-const std::string& llndk_libraries() {
-  static std::string list = InitLlndkLibraries();
+const std::string& llndk_libraries_product() {
+  static std::string list = InitLlndkLibrariesProduct();
+  return list;
+}
+
+const std::string& llndk_libraries_vendor() {
+  static std::string list = InitLlndkLibrariesVendor();
   return list;
 }
 
@@ -335,6 +353,20 @@
 #endif
 }
 
+std::string get_vndk_version(bool is_product_vndk) {
+#if defined(__ANDROID__)
+  if (is_product_vndk) {
+    return android::sysprop::VndkProperties::product_vndk_version().value_or("");
+  }
+  return android::sysprop::VndkProperties::vendor_vndk_version().value_or("");
+#else
+  if (is_product_vndk) {
+    return android::base::GetProperty("ro.product.vndk.version", "");
+  }
+  return android::base::GetProperty("ro.vndk.version", "");
+#endif
+}
+
 namespace internal {
 // Exported for testing
 Result<std::vector<std::string>> ParseConfig(