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

Commit a9cdb9e0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add context to error message." am: 07547144 am: 82e2afb2 am:... 

Merge "Add context to error message." am: 07547144 am: 82e2afb2 am: e210ca9e am: e1cbf0b1 am: 3b33ddc2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052076



Change-Id: I4f18cc43a411957d21f94a3b2447d62d3c3d335b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 955ccb9d 3b33ddc2

tools/aapt2/util/Files.cpp

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ std::optional<std::vector<std::string>> FindFiles(const android::StringPiece& pa 
  const std::string root_dir = path.to_string();

  std::unique_ptr<DIR, decltype(closedir)*> d(opendir(root_dir.data()), closedir);

  if (!d) {

    diag->Error(DiagMessage() << SystemErrorCodeToString(errno));

    diag->Error(DiagMessage() << SystemErrorCodeToString(errno) << ": " << root_dir);

    return {};

  }