Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 131c2c8f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[res] Small cleanup in aapt2 output + optimization" into main

parents f7f6931f e5c50e78

libs/androidfw/AssetManager2.cpp

+2 −3
Original line number Diff line number Diff line
@@ -1467,8 +1467,6 @@ base::expected<uint32_t, NullOrIOError> AssetManager2::GetResourceId( 
  }



  const StringPiece16 kAttr16 = u"attr";

  const static std::u16string kAttrPrivate16 = u"^attr-private";



  for (const PackageGroup& package_group : package_groups_) {

    for (const ConfiguredPackage& package_impl : package_group.packages_) {

      const LoadedPackage* package = package_impl.loaded_package_;
@@ -1486,6 +1484,7 @@ base::expected<uint32_t, NullOrIOError> AssetManager2::GetResourceId( 
        // Private attributes in libraries (such as the framework) are sometimes encoded

        // under the type '^attr-private' in order to leave the ID space of public 'attr'

        // free for future additions. Check '^attr-private' for the same name.

        const static std::u16string kAttrPrivate16 = u"^attr-private";

        resid = package->FindEntryByName(kAttrPrivate16, entry16);

      }

tools/aapt2/Debug.cpp

+15 −13
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ void Debug::PrintTable(const ResourceTable& table, const DebugPrintTableOptions& 
            value->value->Accept(&body_printer);

            printer->Undent();

          }

          if (!entry.flag_disabled_values.empty()) {

            printer->Println("Flag disabled values:");

            for (const auto& value : entry.flag_disabled_values) {

              printer->Print("(");
@@ -364,6 +365,7 @@ void Debug::PrintTable(const ResourceTable& table, const DebugPrintTableOptions& 
              value->value->Accept(&body_printer);

              printer->Undent();

            }

          }

          printer->Undent();

        }

      }