diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2021-01-10 18:01:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-01-10 18:01:49 +0000 |
| commit | 3d91609e47d43f8796b1f4989cdfe5081ba23e4b (patch) | |
| tree | b72d7954a37d61e244aba7c43600e9e2c8bd2579 /libs/androidfw/ApkAssets.cpp | |
| parent | d5d79830ad7506b36bfc2cbf823b3bb05d415653 (diff) | |
| parent | fb4d09cadd27a3fb1a2e268417f0f511aa92e344 (diff) | |
Merge changes I09965e58,I02316d0b,Ic240cdb8
* changes:
Read manifest values using resource id in idmap2
Accept --overlay-name flag in idmap2
Remove idmap path 256 length limit
Diffstat (limited to 'libs/androidfw/ApkAssets.cpp')
| -rwxr-xr-x | libs/androidfw/ApkAssets.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/ApkAssets.cpp b/libs/androidfw/ApkAssets.cpp index cb56a5172a45..011a0de8031f 100755 --- a/libs/androidfw/ApkAssets.cpp +++ b/libs/androidfw/ApkAssets.cpp @@ -385,7 +385,7 @@ std::unique_ptr<const ApkAssets> ApkAssets::LoadOverlay(const std::string& idmap return {}; } - auto overlay_path = loaded_idmap->OverlayApkPath(); + auto overlay_path = std::string(loaded_idmap->OverlayApkPath()); auto assets = ZipAssetsProvider::Create(overlay_path); return (assets) ? LoadImpl(std::move(assets), overlay_path, flags | PROPERTY_OVERLAY, nullptr /* override_asset */, std::move(idmap_asset), |