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

Commit 39ddabf2 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Keep file enumeration consistent across platforms"

parents 4158a67a e6aa6d14
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -186,6 +186,12 @@ static bool LoadInputFilesFromDir(IAaptContext* context, const CompileOptions& o
      out_path_data->push_back(std::move(path_data.value()));
    }
  }

  // File-system directory enumeration order is platform-dependent. Sort the result to remove any
  // inconsistencies between platforms.
  std::sort(
      out_path_data->begin(), out_path_data->end(),
      [](const ResourcePathData& a, const ResourcePathData& b) { return a.source < b.source; });
  return true;
}