commit 69735c3f2e838042b445c78c4cf86d99e0086b8a
author Jooyung Han <jooyung@google.com> Wed Oct 16 22:37:10 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Oct 17 13:03:09 2019 +0000
tree 16efcaa2a04056baeed50af21563afb437ad3fdc
parent 2ec5a2890d614b00a625bd18bdbefc86c5c6d43e

Revert "Change linker config variable: VNDK_VER"

This reverts commit e30a7f5d1f00f4571c4a6ea9766fd22a6be27904.

Reason for revert: some targets are broken

Bug: 142773030
Change-Id: I651ef00a9d1aaac6f0119d31712fb588d8aa68f0
(cherry picked from commit a365ac10a270974fb248b4a2dada54db526f05cb)

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index cee9c3b..37a3189 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -4208,7 +4208,7 @@
   if (insert_pos == std::string::npos) {
     insert_pos = ld_config_file_vndk.length();
   }
-  ld_config_file_vndk.insert(insert_pos, Config::get_vndk_version_string("."));
+  ld_config_file_vndk.insert(insert_pos, Config::get_vndk_version_string('.'));
   return ld_config_file_vndk;
 }
 

linker/linker_config.cpp

diff --git a/linker/linker_config.cpp b/linker/linker_config.cpp
index 450d0e6..46c91a3 100644
--- a/linker/linker_config.cpp
+++ b/linker/linker_config.cpp
@@ -408,7 +408,7 @@
       params.push_back({ "SDK_VER", buf });
     }
 
-    static std::string vndk = Config::get_vndk_version_string("");
+    static std::string vndk = Config::get_vndk_version_string('-');
     params.push_back({ "VNDK_VER", vndk });
 
     for (auto& path : paths) {
@@ -596,11 +596,11 @@
   return true;
 }
 
-std::string Config::get_vndk_version_string(const std::string& prefix) {
+std::string Config::get_vndk_version_string(const char delimiter) {
   std::string version = android::base::GetProperty("ro.vndk.version", "");
   if (version != "" && version != "current") {
-    //add the prefix in front of the string and return it.
-    return version.insert(0, prefix);
+    //add the delimiter char in front of the string and return it.
+    return version.insert(0, 1, delimiter);
   }
   return "";
 }

linker/linker_config.h

diff --git a/linker/linker_config.h b/linker/linker_config.h
index 547c62e..75d9378 100644
--- a/linker/linker_config.h
+++ b/linker/linker_config.h
@@ -164,7 +164,7 @@
                                  const Config** config,
                                  std::string* error_msg);
 
-  static std::string get_vndk_version_string(const std::string& prefix);
+  static std::string get_vndk_version_string(const char delimiter);
  private:
   void clear();