diff options
| author | Elliott Hughes <enh@google.com> | 2019-06-17 16:39:52 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-17 16:39:52 -0700 |
| commit | e6936e2792cc7f5789a3c9811522bef08fe16c28 (patch) | |
| tree | f0b4e9889e1fe4036abaa94af9a2ed2bf7182d9c /libs/androidfw/ApkAssets.cpp | |
| parent | 31d749f007cf40c9405ce10f3a08ea77b2ec0960 (diff) | |
| parent | 0566225cb86a1e613d0edcaf2f3ada5c7191235d (diff) | |
Merge "Move off ZipString and over to std::string/std::string_view as appropriate." into qt-dev-plus-aosp am: ee1c95f060
am: 0566225cb8
Change-Id: I351ea009ee322ecd8bd117e4b2b686c636fb6770
Diffstat (limited to 'libs/androidfw/ApkAssets.cpp')
| -rw-r--r-- | libs/androidfw/ApkAssets.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/ApkAssets.cpp b/libs/androidfw/ApkAssets.cpp index 85b2d6f531aa..9f4a6193b434 100644 --- a/libs/androidfw/ApkAssets.cpp +++ b/libs/androidfw/ApkAssets.cpp @@ -216,7 +216,7 @@ bool ApkAssets::ForEachFile(const std::string& root_path, return false; } - ::ZipString name; + std::string name; ::ZipEntry entry; // We need to hold back directories because many paths will contain them and we want to only @@ -225,7 +225,7 @@ bool ApkAssets::ForEachFile(const std::string& root_path, int32_t result; while ((result = ::Next(cookie, &entry, &name)) == 0) { - StringPiece full_file_path(reinterpret_cast<const char*>(name.name), name.name_length); + StringPiece full_file_path(name); StringPiece leaf_file_path = full_file_path.substr(root_path_full.size()); if (!leaf_file_path.empty()) { |