Cleanup: update VNDK path
Even though the old VNDK path(/system/lib/vndk-sp-<ver>) is still valid
to use (for older prebuilts), it is merely a symbolic link to VNDK APEX.
As a migration effort to the new VNDK path, this change updates the VNDK
path from /system/lib/vndk-sp-<ver> to /apex/com.android.vndk.v<ver>/lib
Bug: 151635798
Test: atest --test-mapping .
Test: device boots with Q vendor
Change-Id: I7260f1a969e4c7f6923d09382eeb2efec7b6c2cd
diff --git a/base/HidlInternal.cpp b/base/HidlInternal.cpp
index 956effd..e38a664 100644
--- a/base/HidlInternal.cpp
+++ b/base/HidlInternal.cpp
@@ -51,17 +51,7 @@
}
std::string getVndkVersionStr() {
- static std::string vndkVersion("0");
- // "0" means the vndkVersion must be initialized with the property value.
- // Otherwise, return the value.
- if (vndkVersion == "0") {
- vndkVersion = base::GetProperty("ro.vndk.version", "");
- if (vndkVersion != "" && vndkVersion != "current") {
- vndkVersion = "-" + vndkVersion;
- } else {
- vndkVersion = "";
- }
- }
+ static std::string vndkVersion = base::GetProperty("ro.vndk.version", "");
return vndkVersion;
}