commit 804e819c1bf64d4df483107e02e896b29e58b3f1
author Tomasz Wasilczyk <twasilczyk@google.com> Wed Aug 23 02:22:53 2023 +0000
committer Tomasz Wasilczyk <twasilczyk@google.com> Fri Sep 01 19:05:34 2023 +0000
tree 300e8f502c5ca18104016ebe30885d0aecf49125
parent cc7212ddf54bc9ec55d1f08db39833a7c3d91078

Move String8 path functions to androidfw and aapt

Test: m checkbuild
Bug: 295394788
Change-Id: I9488bc5632cbd47c83f6b5f2df4c87eb324a1e8e

tools/aapt/DirectoryWalker.h

diff --git a/tools/aapt/DirectoryWalker.h b/tools/aapt/DirectoryWalker.h
index cea3a6e..7f60d4d 100644
--- a/tools/aapt/DirectoryWalker.h
+++ b/tools/aapt/DirectoryWalker.h
@@ -7,6 +7,7 @@
 #ifndef DIRECTORYWALKER_H
 #define DIRECTORYWALKER_H
 
+#include <androidfw/PathUtils.h>
 #include <dirent.h>
 #include <sys/types.h>
 #include <sys/param.h>
@@ -77,7 +78,7 @@
 
         mEntry = *entryPtr;
         // Get stats
-        String8 fullPath = mBasePath.appendPathCopy(mEntry.d_name);
+        String8 fullPath = appendPathCopy(mBasePath, mEntry.d_name);
         stat(fullPath.c_str(),&mStats);
         return &mEntry;
     };