commit cf6e79f809034386b04ae551db815ab087f76c0a
author Yurii Zubrytskyi <zyy@google.com> Wed Apr 26 16:20:09 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 26 16:20:09 2023 +0000
tree 47bc75f8f64d523e9f99d73c236a320775956086
parent c357f719ed3734aee05418808699a48dd150a1a5

Revert "Use reference counted pointers for ApkAssets"

This reverts commit c357f719ed3734aee05418808699a48dd150a1a5.

Reason for revert: b/279154343 - performance regression

Change-Id: If2e212d8fc5b9ed8638032a33f450440cbaeceb0

cmds/idmap2/libidmap2/ResourceContainer.cpp

diff --git a/cmds/idmap2/libidmap2/ResourceContainer.cpp b/cmds/idmap2/libidmap2/ResourceContainer.cpp
index 7869fbd..0e35904 100644
--- a/cmds/idmap2/libidmap2/ResourceContainer.cpp
+++ b/cmds/idmap2/libidmap2/ResourceContainer.cpp
@@ -262,7 +262,7 @@
 }
 
 struct ResState {
-  AssetManager2::ApkAssetsPtr apk_assets;
+  std::unique_ptr<ApkAssets> apk_assets;
   const LoadedArsc* arsc;
   const LoadedPackage* package;
   std::unique_ptr<AssetManager2> am;
@@ -284,7 +284,7 @@
     }
 
     state.am = std::make_unique<AssetManager2>();
-    if (!state.am->SetApkAssets({state.apk_assets})) {
+    if (!state.am->SetApkAssets({state.apk_assets.get()})) {
       return Error("failed to create asset manager");
     }