diff options
author | Jooyung Han <jooyung@google.com> | 2019-09-26 14:57:07 +0900 |
---|---|---|
committer | Jooyung Han <jooyung@google.com> | 2019-10-11 10:09:16 +0900 |
commit | e30a7f5d1f00f4571c4a6ea9766fd22a6be27904 (patch) | |
tree | d159638d45c588205b380b287d3424c10058c41f /linker/linker.cpp | |
parent | 87a10ac108aa8baf47c12559ea501813ea3fd575 (diff) |
Change linker config variable: VNDK_VER
With VNDK APEX, the path for VNDK libs has been changed
from /system/lib/vndk-VER to /apex/com.android.vndk.vVER/lib
Previously, VNDK_VER is replaced with prefix(e.g. "-29"). We could
still prepend prefix("v") to the vndk version, but this change uses a
raw vndk version as the value of VNKD_VER.
Bug: 141451661
Test: m && boot (tested with cuttlefish)
Change-Id: Ibf4cf5e29b7f28e733d4b3bc15171f4359e1d2f2
Diffstat (limited to 'linker/linker.cpp')
-rw-r--r-- | linker/linker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp index 37a318916..cee9c3b31 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -4208,7 +4208,7 @@ static std::string get_ld_config_file_vndk_path() { 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; } |