summaryrefslogtreecommitdiff
path: root/tools/aapt/CrunchCache.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-08-18 19:43:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-18 19:43:38 +0000
commit9836a1cebb1a95112140c96fad1104d191de391e (patch)
treeb2868830f6884bd31c5444feee6708293c97156a /tools/aapt/CrunchCache.cpp
parent5eef9a145702b2069656ff6cfd147adfe1adbaab (diff)
parent0e91b7269483d6392203606b3a766807d175b4ba (diff)
Merge "Use String8/16 c_str [tools]" into udc-dev-plus-aosp am: b370693c67 am: 64441287a5 am: 0e91b72694
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24484497 Change-Id: I1436ad48bfcbe44c5fc67d41f76cd86cd6a62048 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/CrunchCache.cpp')
-rw-r--r--tools/aapt/CrunchCache.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/CrunchCache.cpp b/tools/aapt/CrunchCache.cpp
index 7b8a576b88d3..1f2febec2230 100644
--- a/tools/aapt/CrunchCache.cpp
+++ b/tools/aapt/CrunchCache.cpp
@@ -44,7 +44,7 @@ size_t CrunchCache::crunch(CacheUpdater* cu, bool forceOverwrite)
// This efficiently strips the source directory prefix from our path.
// Also, String8 doesn't have a substring method so this is what we've
// got to work with.
- const char* rPathPtr = mSourceFiles.keyAt(0).string()+mSourcePath.length();
+ const char* rPathPtr = mSourceFiles.keyAt(0).c_str()+mSourcePath.length();
// Strip leading slash if present
int offset = 0;
if (rPathPtr[0] == OS_PATH_SEPARATOR)