commit 2a447172a5b8c4fdb8527602144691802c492c2e
author Adam Lesinski <adamlesinski@google.com> Fri Feb 09 11:02:13 2018 -0800
committer Adam Lesinski <adamlesinski@google.com> Fri Feb 09 12:43:17 2018 -0800
tree abbd3839e76a0c55628c3c905a9b30f90133e56d
parent 56c82be0d4075a434217a0d56be8e6544fb05a96

Revert "libandroidfw: Make sure to set the 'app as lib' flag"

This reverts commit 9ad287c828a116f844e5c03346c618d83727e4ae.

Bug: 73134570
Change-Id: If930d3a7c17fc2f7ffaebd31281ad5a5d120144f

libs/androidfw/AssetManager2.cpp

diff --git a/libs/androidfw/AssetManager2.cpp b/libs/androidfw/AssetManager2.cpp
index 20dba37..2fc8e95 100644
--- a/libs/androidfw/AssetManager2.cpp
+++ b/libs/androidfw/AssetManager2.cpp
@@ -74,9 +74,7 @@
       if (idx == 0xff) {
         package_ids_[package_id] = idx = static_cast<uint8_t>(package_groups_.size());
         package_groups_.push_back({});
-        DynamicRefTable& ref_table = package_groups_.back().dynamic_ref_table;
-        ref_table.mAssignedPackageId = package_id;
-        ref_table.mAppAsLib = package->IsDynamic() && package->GetPackageId() == 0x7f;
+        package_groups_.back().dynamic_ref_table.mAssignedPackageId = package_id;
       }
       PackageGroup* package_group = &package_groups_[idx];
 
@@ -107,15 +105,7 @@
 void AssetManager2::DumpToLog() const {
   base::ScopedLogSeverity _log(base::INFO);
 
-  LOG(INFO) << base::StringPrintf("AssetManager2(this=%p)", this);
-
   std::string list;
-  for (const auto& apk_assets : apk_assets_) {
-    base::StringAppendF(&list, "%s,", apk_assets->GetPath().c_str());
-  }
-  LOG(INFO) << "ApkAssets: " << list;
-
-  list = "";
   for (size_t i = 0; i < package_ids_.size(); i++) {
     if (package_ids_[i] != 0xff) {
       base::StringAppendF(&list, "%02x -> %d, ", (int) i, package_ids_[i]);
@@ -126,12 +116,9 @@
   for (const auto& package_group: package_groups_) {
       list = "";
       for (const auto& package : package_group.packages_) {
-        base::StringAppendF(&list, "%s(%02x%s), ", package->GetPackageName().c_str(),
-                            package->GetPackageId(), (package->IsDynamic() ? " dynamic" : ""));
+        base::StringAppendF(&list, "%s(%02x), ", package->GetPackageName().c_str(), package->GetPackageId());
       }
-      LOG(INFO) << base::StringPrintf("PG (%02x): ",
-                                      package_group.dynamic_ref_table.mAssignedPackageId)
-                << list;
+      LOG(INFO) << base::StringPrintf("PG (%02x): ", package_group.dynamic_ref_table.mAssignedPackageId) << list;
   }
 }