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

Browse Source 
am: c0874fe247

Change-Id: I0efe6d12a5db57e27ffed4e4dcf01e7e30ffef6f
This commit is contained in:
Ryan Mitchell
2019-06-03 13:48:24 -07:00
committed by android-build-merger
parent f0500769e1 c0874fe247
commit ab2fc34fc2
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,