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

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

Merge "Fix idmap scan to apply odm and oem policies" into qt-dev am: 35e7fa1b 

am: 2cdba65f

Change-Id: Ic1f66749eb67668be29d38855861ae9a3d228e66
parents a2a34a31 2cdba65f

cmds/idmap2/idmap2/Scan.cpp

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
using android::idmap2::CommandLineOptions;

using android::idmap2::Error;

using android::idmap2::Idmap;

using android::idmap2::kPolicyOdm;

using android::idmap2::kPolicyOem;

using android::idmap2::kPolicyProduct;

using android::idmap2::kPolicyPublic;

using android::idmap2::kPolicySystem;
@@ -93,6 +95,8 @@ Result<std::unique_ptr<std::vector<std::string>>> FindApkFiles(const std::vector 


std::vector<std::string> PoliciesForPath(const std::string& apk_path) {

  static const std::vector<std::pair<std::string, std::string>> values = {

      {"/odm/", kPolicyOdm},

      {"/oem/", kPolicyOem},

      {"/product/", kPolicyProduct},

      {"/system/", kPolicySystem},

      {"/vendor/", kPolicyVendor},