diff options
| author | 2023-09-06 19:46:54 +0000 | |
|---|---|---|
| committer | 2023-09-06 19:46:54 +0000 | |
| commit | aa95ff271a31f903727c5ebc2e4990846c2073d2 (patch) | |
| tree | 247609dc143ce6d8fc0c588fb8b8ef15bbd1d172 /tools/aapt/Package.cpp | |
| parent | b61b138892b337b9abf7082dde5c7c17eb82ab49 (diff) | |
| parent | 4fb86ec92a08a65e2ab52f8e361edb15b380cfc4 (diff) | |
Merge "Move String8 path functions to androidfw and aapt" into main am: 713e3930c4 am: 0cfc1c6ddd am: 9a80e1b70c am: 13ab173d41 am: 4fb86ec92a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2723454
Change-Id: I91016723c47501051b8768c0ee29f8821cab0331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/Package.cpp')
| -rw-r--r-- | tools/aapt/Package.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/aapt/Package.cpp b/tools/aapt/Package.cpp index a7ff5fabf495..5e0f87f0dcaf 100644 --- a/tools/aapt/Package.cpp +++ b/tools/aapt/Package.cpp @@ -10,6 +10,7 @@ #include "ResourceFilter.h" #include "Utils.h" +#include <androidfw/PathUtils.h> #include <androidfw/misc.h> #include <utils/Log.h> @@ -170,7 +171,7 @@ status_t writeAPK(Bundle* bundle, const String8& outputFile, const sp<OutputSet> /* anything here? */ if (zip->getNumEntries() == 0) { if (bundle->getVerbose()) { - printf("Archive is empty -- removing %s\n", outputFile.getPathLeaf().c_str()); + printf("Archive is empty -- removing %s\n", getPathLeaf(outputFile).c_str()); } delete zip; // close the file so we can remove it in Win32 zip = NULL; @@ -274,9 +275,9 @@ bool processFile(Bundle* bundle, ZipFile* zip, return true; } - if (strcasecmp(storageName.getPathExtension().c_str(), ".gz") == 0) { + if (strcasecmp(getPathExtension(storageName).c_str(), ".gz") == 0) { fromGzip = true; - storageName = storageName.getBasePath(); + storageName = getBasePath(storageName); } if (bundle->getUpdate()) { @@ -366,7 +367,7 @@ bool processFile(Bundle* bundle, ZipFile* zip, */ bool okayToCompress(Bundle* bundle, const String8& pathName) { - String8 ext = pathName.getPathExtension(); + String8 ext = getPathExtension(pathName); int i; if (ext.length() == 0) |