commit e59f0d80ec19249f72c07ae191ad673d040443e3
author Adam Lesinski <adamlesinski@google.com> Fri Oct 13 09:36:53 2017 -0700
committer Adam Lesinski <adamlesinski@google.com> Thu Oct 19 13:22:48 2017 -0700
tree 8abc84d8e3739cab881a34a64d6459d9d187b48b
parent 004511660671511ae88e0e837a6f92db28eadaef

AAPT2: Enable building proto artifacts

- This will allow the bundle tool to ingest the outputs of the aapt2 link
  phase.

Bug: 64143208
Test: manual
Change-Id: I1a4b3ce5c2ffbbdc4bc642c3371a9ef2e7e9ad71

tools/aapt2/cmd/Dump.cpp

diff --git a/tools/aapt2/cmd/Dump.cpp b/tools/aapt2/cmd/Dump.cpp
index 7be6dc0..090c3fb 100644
--- a/tools/aapt2/cmd/Dump.cpp
+++ b/tools/aapt2/cmd/Dump.cpp
@@ -65,21 +65,19 @@
   std::unique_ptr<io::ZipFileCollection> zip = io::ZipFileCollection::Create(file_path, &err);
   if (zip) {
     ResourceTable table;
-    if (io::IFile* file = zip->FindFile("resources.arsc.flat")) {
+    if (io::IFile* file = zip->FindFile("resources.pb")) {
       std::unique_ptr<io::IData> data = file->OpenAsData();
       if (data == nullptr) {
-        context->GetDiagnostics()->Error(DiagMessage(file_path)
-                                         << "failed to open resources.arsc.flat");
+        context->GetDiagnostics()->Error(DiagMessage(file_path) << "failed to open resources.pb");
         return false;
       }
 
       pb::ResourceTable pb_table;
       if (!pb_table.ParseFromArray(data->data(), data->size())) {
-        context->GetDiagnostics()->Error(DiagMessage(file_path) << "invalid resources.arsc.flat");
+        context->GetDiagnostics()->Error(DiagMessage(file_path) << "invalid resources.pb");
         return false;
       }
 
-      ResourceTable table;
       if (!DeserializeTableFromPb(pb_table, &table, &err)) {
         context->GetDiagnostics()->Error(DiagMessage(file_path)
                                          << "failed to parse table: " << err);
@@ -98,7 +96,7 @@
       }
     }
 
-    Debug::PrintTable(&table, print_options);
+    Debug::PrintTable(table, print_options);
     return true;
   }
 
@@ -137,7 +135,7 @@
         continue;
       }
 
-      Debug::PrintTable(&table, print_options);
+      Debug::PrintTable(table, print_options);
     } else if (entry->Type() == ContainerEntryType::kResFile) {
       pb::internal::CompiledFile pb_compiled_file;
       off64_t offset;