commit 338698ee0d3ad187251c9c1222d28c6380a42c9c
author Elliott Hughes <enh@google.com> Tue Jul 13 17:15:19 2021 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> Wed Aug 23 20:01:31 2023 +0000
tree f738c044a44fdab940c054f46ee15e4840ce2643
parent a2d740da81964480f384a4925fe7ddcf3782a498

Move convertToResPath from libutils to aapt.

Test: m libaapt
Bug: 295394788
Change-Id: I3225f2cd28ff0e1c3e396d0b336e51b9a8caa1f9

tools/aapt/ResourceTable.cpp

diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp
index 3abb89a..b6a17eb 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 @@
     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 @@
         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()) {