diff options
| author | 2023-08-23 23:04:57 +0000 | |
|---|---|---|
| committer | 2023-08-23 23:04:57 +0000 | |
| commit | 189cc5941bafa17bb8079dd0fa02535cfe2358ef (patch) | |
| tree | 8e452d0cc7be1a87721f29e9de36962e486cce50 /tools/aapt/Resource.cpp | |
| parent | 7adaa2d7f2fe39099638b736df83631988a6a0d8 (diff) | |
| parent | c623d60534abf5ae72a3d531a487598134896207 (diff) | |
Merge "Move convertToResPath from libutils to aapt." into main am: 0637b02cd6 am: ca6f087594 am: 5e49797a2d am: c623d60534
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2721353
Change-Id: I70d3231bf180a77d3992df0f64bc36283b3d7125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/Resource.cpp')
| -rw-r--r-- | tools/aapt/Resource.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index 4ca3a68d02a6..9c944e0de075 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -15,6 +15,7 @@ #include "ResourceTable.h" #include "StringPool.h" #include "Symbol.h" +#include "Utils.h" #include "WorkQueue.h" #include "XMLNode.h" @@ -321,7 +322,7 @@ static status_t makeFileResources(Bundle* bundle, const sp<AaptAssets>& assets, str++; } String8 resPath = it.getPath(); - resPath.convertToResPath(); + convertToResPath(resPath); status_t result = table->addEntry(SourcePos(it.getPath(), 0), String16(assets->getPackage()), type16, |