Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove stopship for idmap2 vendor sdk checking" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-03 20:31:59 +00:00
committed by Android (Google) Code Review
parent aac39e204d 56db15b843
commit f5671d390d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmds/idmap2/idmap2/Scan.cpp
View File

@@ -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,