diff options
author | Jooyung Han <jooyung@google.com> | 2019-08-26 22:04:57 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-26 22:04:57 -0700 |
commit | e585a2a7483c98b3702b64018f2c80dcc40e4636 (patch) | |
tree | 77d8b5c5853ddead0d65e448b7c9808eba5060d9 | |
parent | 5b8d0757f1437fe77b7802c5c4daf5514273a4e2 (diff) | |
parent | c896a066d25296d5e98d2ec2cce1f48e3018f0a4 (diff) | |
download | bionic-e585a2a7483c98b3702b64018f2c80dcc40e4636.tar.gz |
Merge "Revert "linker: cleanup (removing unused VNDK_VER)""
am: c896a066d2
Change-Id: I8089b8abb3826beea8cbf91a12ba3c74208cd398
-rw-r--r-- | linker/linker_config.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linker/linker_config.cpp b/linker/linker_config.cpp index a8c0e36d8..46c91a3dd 100644 --- a/linker/linker_config.cpp +++ b/linker/linker_config.cpp @@ -408,6 +408,9 @@ class Properties { params.push_back({ "SDK_VER", buf }); } + static std::string vndk = Config::get_vndk_version_string('-'); + params.push_back({ "VNDK_VER", vndk }); + for (auto& path : paths) { format_string(&path, params); } |