diff options
| author | 2023-08-23 23:55:51 +0000 | |
|---|---|---|
| committer | 2023-08-23 23:55:51 +0000 | |
| commit | 3c9a185b727ef1320fe6d759585d194fce0859ee (patch) | |
| tree | bc84394a7ffc4baa50f3208c6f249818c7d3deb3 /tools/aapt/ResourceTable.cpp | |
| parent | 72c00df5d9a6a75529b0f2be9cc86eb7aa817e58 (diff) | |
| parent | 189cc5941bafa17bb8079dd0fa02535cfe2358ef (diff) | |
Merge "Move convertToResPath from libutils to aapt." into main am: 0637b02cd6 am: ca6f087594 am: 5e49797a2d am: c623d60534 am: 189cc5941b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2721353
Change-Id: Ie53af137a8145c5203a66a20f96eb88683674d23
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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 23440074a326..449e0808806e 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -11,6 +11,7 @@ #include "ResourceFilter.h" #include "ResourceIdCache.h" #include "SdkConstants.h" +#include "Utils.h" #include <algorithm> #include <androidfw/ResourceTypes.h> @@ -4803,7 +4804,7 @@ bool ResourceTable::versionForCompat(const Bundle* bundle, const String16& resou String8 resPath = String8::format("res/%s/%s.xml", newFile->getGroupEntry().toDirName(target->getResourceType()).c_str(), String8(resourceName).c_str()); - resPath.convertToResPath(); + convertToResPath(resPath); // Add a resource table entry. addEntry(SourcePos(), @@ -4927,7 +4928,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, String8 resPath = String8::format("res/%s/%s.xml", newFile->getGroupEntry().toDirName(target->getResourceType()).c_str(), String8(resourceName).c_str()); - resPath.convertToResPath(); + convertToResPath(resPath); // Add a resource table entry. if (bundle->getVerbose()) { |