diff options
| -rw-r--r-- | cmds/idmap2/idmap2/Scan.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmds/idmap2/idmap2/Scan.cpp b/cmds/idmap2/idmap2/Scan.cpp index 83c034b4bc42..21c6bd280064 100644 --- a/cmds/idmap2/idmap2/Scan.cpp +++ b/cmds/idmap2/idmap2/Scan.cpp @@ -68,9 +68,10 @@ struct InputOverlay { }; bool VendorIsQOrLater() { - // STOPSHIP(b/119390857): Check api version once Q sdk version is finalized - std::string version = android::base::GetProperty("ro.vndk.version", "Q"); - return version == "Q" || version == "q"; + constexpr int kQSdkVersion = 29; + int version = std::atoi(android::base::GetProperty("ro.vndk.version", "29").data()); + // If the string cannot be parsed, it is a development sdk codename. + return version >= kQSdkVersion || version == 0; } Result<std::unique_ptr<std::vector<std::string>>> FindApkFiles(const std::vector<std::string>& dirs, |