diff options
| author | 2021-07-13 17:15:19 -0700 | |
|---|---|---|
| committer | 2023-08-23 20:01:31 +0000 | |
| commit | 338698ee0d3ad187251c9c1222d28c6380a42c9c (patch) | |
| tree | f738c044a44fdab940c054f46ee15e4840ce2643 /tools/aapt/ResourceTable.cpp | |
| parent | a2d740da81964480f384a4925fe7ddcf3782a498 (diff) | |
Move convertToResPath from libutils to aapt.
Test: m libaapt
Bug: 295394788
Change-Id: I3225f2cd28ff0e1c3e396d0b336e51b9a8caa1f9
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()) { |