Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56db15b8 authored by Ryan Mitchell's avatar Ryan Mitchell
Browse files

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
parent dc40440e

cmds/idmap2/idmap2/Scan.cpp

+4 −3
Original line number Diff line number Diff line
@@ -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,