diff options
| author | 2023-09-06 17:30:04 +0000 | |
|---|---|---|
| committer | 2023-09-06 17:30:04 +0000 | |
| commit | 9a80e1b70c9b9aaef268c8c0ea04b3fa5ce3debb (patch) | |
| tree | 389cb13cb22892be9d8392859e257e0c6ba0f423 /tools/aapt/ResourceTable.cpp | |
| parent | 83d551452511b9970caa5fff180f2ed2cc0ed3e2 (diff) | |
| parent | 0cfc1c6dddcc94b931a88c741eb99848b7741a6d (diff) | |
Merge "Move String8 path functions to androidfw and aapt" into main am: 713e3930c4 am: 0cfc1c6ddd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2723454
Change-Id: Ife8d287e3819c5aea7127f8af9a57fa0c7139b9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 bc252cfff239..2df9d63b8e99 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; } |