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

Commit 4f541860 authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi
Browse files

[idmap] Small cleanup in create-multiple

Test: build + idmap2_tests
Flag: EXEMPT cleanup

Change-Id: I949087c6b0a6ac93d56eecc5eec14df924dbf317
parent c53a3da2
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ Result<Unit> CreateMultiple(const std::vector<std::string>& args) {

  std::vector<std::string> idmap_paths;
  for (const std::string& overlay_apk_path : overlay_apk_paths) {
    const std::string idmap_path = Idmap::CanonicalIdmapPathFor(idmap_dir, overlay_apk_path);
    std::string idmap_path = Idmap::CanonicalIdmapPathFor(idmap_dir, overlay_apk_path);
    const uid_t uid = getuid();
    if (!UidHasWriteAccessToPath(uid, idmap_path)) {
      LOG(WARNING) << "uid " << uid << "does not have write access to " << idmap_path.c_str();
@@ -111,7 +111,7 @@ Result<Unit> CreateMultiple(const std::vector<std::string>& args) {
                !ignore_overlayable)) {
      const auto overlay = OverlayResourceContainer::FromPath(overlay_apk_path);
      if (!overlay) {
        LOG(WARNING) << "failed to load apk " << overlay_apk_path.c_str();
        LOG(WARNING) << "failed to load apk " << overlay_apk_path;
        continue;
      }

@@ -138,7 +138,7 @@ Result<Unit> CreateMultiple(const std::vector<std::string>& args) {
      }
    }

    idmap_paths.emplace_back(idmap_path);
    idmap_paths.emplace_back(std::move(idmap_path));
  }

  for (const std::string& idmap_path : idmap_paths) {