diff options
| author | 2023-09-06 15:59:11 +0000 | |
|---|---|---|
| committer | 2023-09-06 15:59:11 +0000 | |
| commit | 713e3930c42a3b1a5bb7909ed0f59d498cdae227 (patch) | |
| tree | 1685bc2f372e5802e3603b03b455598d6e780503 /tools/aapt/ResourceTable.cpp | |
| parent | 9bf0ec58f18d0fe1a44cb7b034a07645bc94d0c5 (diff) | |
| parent | 804e819c1bf64d4df483107e02e896b29e58b3f1 (diff) | |
Merge "Move String8 path functions to androidfw and aapt" into main
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index bccf73e69c34..421cae78b08b 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -14,6 +14,7 @@ #include "Utils.h" #include <algorithm> +#include <androidfw/PathUtils.h> #include <androidfw/ResourceTypes.h> #include <utils/ByteOrder.h> #include <utils/TypeHelpers.h> @@ -83,7 +84,7 @@ status_t compileXmlFile(const Bundle* bundle, sp<AaptDir> resDir = assets->getDirs().valueFor(String8("res")); sp<AaptDir> dir = resDir->getDirs().valueFor(target->getGroupEntry().toDirName( target->getResourceType())); - dir->removeFile(target->getPath().getPathLeaf()); + dir->removeFile(getPathLeaf(target->getPath())); return NO_ERROR; } |