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

Commit c0874fe2 authored by Ryan Mitchell's avatar Ryan Mitchell Committed by android-build-merger
Browse files

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

am: f5671d39

Change-Id: Ie4777d5e7a9f03006b2aef519fc223490ef5bcd2
parents 9b7de651 f5671d39

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,