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/Package.cpp

diff --git a/tools/aapt/Package.cpp b/tools/aapt/Package.cpp
index 965655b..a7ff5fa 100644
--- a/tools/aapt/Package.cpp
+++ b/tools/aapt/Package.cpp
@@ -8,6 +8,7 @@
 #include "OutputSet.h"
 #include "ResourceTable.h"
 #include "ResourceFilter.h"
+#include "Utils.h"
 
 #include <androidfw/misc.h>
 
@@ -226,7 +227,7 @@
             fprintf(stderr, "warning: null file being processed.\n");
         } else {
             String8 storagePath(entry.getPath());
-            storagePath.convertToResPath();
+            convertToResPath(storagePath);
             if (!processFile(bundle, zip, storagePath, entry.getFile())) {
                 return UNKNOWN_ERROR;
             }