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

Commit 9bafe4d7 authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi
Browse files

[aapt2] Improve "dump chunks" output 

- print the sparse/dense string for each type chunk

- skip looking for a non-string ID in the string pool

- print the bag attribute's name-id in hex and on the same line

Test: aapt2 dump chunks on a few apks
Flag: EXEMPT bugfix in a tool
Change-Id: Ib1c55fe6e5577a84cd4fc5682940e5bfbb3031fa
parent dd2d7b36

tools/aapt2/Debug.cpp

+11 −13
Original line number Diff line number Diff line
@@ -683,8 +683,6 @@ class ChunkPrinter { 
      item->PrettyPrint(printer_);

      printer_->Print(")");

    }



    printer_->Print("\n");

  }



  void PrintQualifiers(uint32_t qualifiers) const {
@@ -763,11 +761,13 @@ class ChunkPrinter { 


  bool PrintTableType(const ResTable_type* chunk) {

    printer_->Print(StringPrintf(" id: 0x%02x", android::util::DeviceToHost32(chunk->id)));

    printer_->Print(StringPrintf(

        " name: %s",

        android::util::GetString(type_pool_, android::util::DeviceToHost32(chunk->id) - 1)

            .c_str()));

    const auto name =

        android::util::GetString(type_pool_, android::util::DeviceToHost32(chunk->id) - 1);

    printer_->Print(StringPrintf(" name: %s", name.c_str()));

    printer_->Print(StringPrintf(" flags: 0x%02x", android::util::DeviceToHost32(chunk->flags)));

    printer_->Print(android::util::DeviceToHost32(chunk->flags) & ResTable_type::FLAG_SPARSE

                        ? " (SPARSE)"

                        : " (DENSE)");

    printer_->Print(

        StringPrintf(" entryCount: %u", android::util::DeviceToHost32(chunk->entryCount)));

    printer_->Print(
@@ -777,8 +777,7 @@ class ChunkPrinter { 
    config.copyFromDtoH(chunk->config);

    printer_->Print(StringPrintf(" config: %s\n", config.to_string().c_str()));



    const ResourceType* type = ParseResourceType(

        android::util::GetString(type_pool_, android::util::DeviceToHost32(chunk->id) - 1));

    const ResourceType* type = ParseResourceType(name);



    printer_->Indent();
@@ -817,10 +816,7 @@ class ChunkPrinter { 
        for (size_t i = 0; i < map_entry_count; i++) {

          PrintResValue(&(maps[i].value), config, type);



          printer_->Print(StringPrintf(

              " name: %s name-id:%d\n",

              android::util::GetString(key_pool_, android::util::DeviceToHost32(maps[i].name.ident))

                  .c_str(),

          printer_->Print(StringPrintf(" name-id: 0x%08x\n",

                                       android::util::DeviceToHost32(maps[i].name.ident)));

        }

      } else {
@@ -829,6 +825,8 @@ class ChunkPrinter { 
        // Print the value of the entry

        Res_value value = entry->value();

        PrintResValue(&value, config, type);



        printer_->Print("\n");

      }



      printer_->Undent();