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 
am: f5671d390d

Change-Id: If78cd6fdd133f526aea475c42bc124c98bc01ce7
This commit is contained in:
Ryan Mitchell
2019-06-03 13:43:46 -07:00
committed by android-build-merger
parent eb366a5f25 f5671d390d
commit 90b70e5cea
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() { bool VendorIsQOrLater() {
// STOPSHIP(b/119390857): Check api version once Q sdk version is finalized constexpr int kQSdkVersion = 29;
std::string version = android::base::GetProperty("ro.vndk.version", "Q"); int version = std::atoi(android::base::GetProperty("ro.vndk.version", "29").data());
return version == "Q" || version == "q"; // 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, Result<std::unique_ptr<std::vector<std::string>>> FindApkFiles(const std::vector<std::string>& dirs,