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

libs/androidfw/tests/AttributeResolution_test.cpp

diff --git a/libs/androidfw/tests/AttributeResolution_test.cpp b/libs/androidfw/tests/AttributeResolution_test.cpp
index 329830f..bb9129a 100644
--- a/libs/androidfw/tests/AttributeResolution_test.cpp
+++ b/libs/androidfw/tests/AttributeResolution_test.cpp
@@ -36,11 +36,11 @@
   virtual void SetUp() override {
     styles_assets_ = ApkAssets::Load(GetTestDataPath() + "/styles/styles.apk");
     ASSERT_NE(nullptr, styles_assets_);
-    assetmanager_.SetApkAssets({styles_assets_});
+    assetmanager_.SetApkAssets({styles_assets_.get()});
   }
 
  protected:
-  AssetManager2::ApkAssetsPtr styles_assets_;
+  std::unique_ptr<const ApkAssets> styles_assets_;
   AssetManager2 assetmanager_;
 };
 
@@ -69,7 +69,7 @@
   AssetManager2 assetmanager;
   auto apk_assets = ApkAssets::Load(GetTestDataPath() + "/styles/styles.apk", PROPERTY_DYNAMIC);
   ASSERT_NE(nullptr, apk_assets);
-  assetmanager.SetApkAssets({apk_assets});
+  assetmanager.SetApkAssets({apk_assets.get()});
 
   std::unique_ptr<Theme> theme = assetmanager.NewTheme();