From 56db15b8437e2e3bda63e19c30a87c56fa1dfde6 Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Mon, 3 Jun 2019 10:48:48 -0700 Subject: Remove stopship for idmap2 vendor sdk checking Idmap now checks if the version of the vendor partition is greater than or equal to 29 or a development codename to enable enforcement of overlayable resources. Bug: 119390857 Test: manual Change-Id: Ica25800432993beb7464436d4fba7cb391e621ef --- cmds/idmap2/idmap2/Scan.cpp | 7 ++++--- 1 file 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>> FindApkFiles(const std::vector& dirs, -- cgit v1.2.3-59-g8ed1b