commit 75d7488ab4c93badbbb2243f8a58741b8dc6eba2
author Jooyung Han <jooyung@google.com> Wed Oct 30 18:16:18 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 30 18:16:18 2019 -0700
tree 90efdf4d61064bb93537a277bc3f60308830161f
parent f770cbdd7c55ab7281b0166805922fe2555b5342
parent d90779cb85a5b8c55178c25eca6ff47f563808e4

Merge "Add linker config variable: VNDK_APEX_VER" am: dd2ed97079 am: 436e09b1a6
am: d90779cb85

Change-Id: I17995d4d1b3eff9930762d715bb353fbe1236e01

linker/linker_config.cpp

diff --git a/linker/linker_config.cpp b/linker/linker_config.cpp
index 46c91a3..85ea8d1 100644
--- a/linker/linker_config.cpp
+++ b/linker/linker_config.cpp
@@ -408,8 +408,10 @@
       params.push_back({ "SDK_VER", buf });
     }
 
-    static std::string vndk = Config::get_vndk_version_string('-');
-    params.push_back({ "VNDK_VER", vndk });
+    static std::string vndk_ver = Config::get_vndk_version_string('-');
+    params.push_back({ "VNDK_VER", vndk_ver });
+    static std::string vndk_apex_ver = Config::get_vndk_version_string('v');
+    params.push_back({ "VNDK_APEX_VER", vndk_apex_ver });
 
     for (auto& path : paths) {
       format_string(&path, params);