diff options
| author | 2023-08-23 21:01:35 +0000 | |
|---|---|---|
| committer | 2023-08-23 21:01:35 +0000 | |
| commit | 0637b02cd6336389ea578e3bcc384a73cdd4152c (patch) | |
| tree | 9b925b49fafebd3ac4c73cc2b87bfaff95ddb360 /tools/aapt/ResourceTable.cpp | |
| parent | 73a013641eab4557ce133243cf8b2daccee24a79 (diff) | |
| parent | 338698ee0d3ad187251c9c1222d28c6380a42c9c (diff) | |
Merge "Move convertToResPath from libutils to aapt." into main
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 3abb89acd23b..b6a17eb3e684 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()) { |