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

Commit 94643cc0 authored by Luke Edgar's avatar Luke Edgar Committed by Automerger Merge Worker
Browse files

Merge "AAPT Files - Permit invariant filepaths for getting file names" am:... 

Merge "AAPT Files - Permit invariant filepaths for getting file names" am: 0ba2a37e am: c8b5598a am: b568a820 am: 4b7dd9fc

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

Change-Id: Ibcb2b129b94db1d3a83160c2b413792c24509c79
parents 27f9c205 4b7dd9fc

tools/aapt2/util/Files.cpp

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ StringPiece GetFilename(const StringPiece& path) { 
  const char* end = path.end();

  const char* last_dir_sep = path.begin();

  for (const char* c = path.begin(); c != end; ++c) {

    if (*c == sDirSep) {

    if (*c == sDirSep || *c == sInvariantDirSep) {

      last_dir_sep = c + 1;

    }

  }

tools/aapt2/util/Files.h

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ constexpr const char sDirSep = '/'; 
constexpr const char sPathSep = ':';

#endif



constexpr const char sInvariantDirSep = '/';



enum class FileType {

  kUnknown = 0,

  kNonexistant,