commit b791721cd1a6154e5582d824f5d20b2c8b8d5ac5
author Adam Lesinski <adamlesinski@google.com> Thu Aug 10 15:37:28 2017 -0700
committer Adam Lesinski <adamlesinski@google.com> Thu Sep 14 11:31:04 2017 -0700
tree 363ba007cc0cd5d4ae55b7516696ac7064907feb
parent 44ec315e06560a5fc0e2cc462ef67c2a47e894b1

AAPT2: Define intermediate compiled XML proto

This proto format is meant to encapsulate more information
that is specific to Android and allows for easier validation
and manipulation across tools.

Test: make aapt2_tests
Bug: 65645766
Change-Id: I13bc34a460671fc0a36246be0d287a3d37d244d6
Merged-In: I13bc34a460671fc0a36246be0d287a3d37d244d6

tools/aapt2/cmd/Link.cpp

diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp
index e50d6b3..d9e7ac6 100644
--- a/tools/aapt2/cmd/Link.cpp
+++ b/tools/aapt2/cmd/Link.cpp
@@ -1295,7 +1295,7 @@
       }
 
       for (uint32_t i = 0; i < num_files; i++) {
-        pb::CompiledFile compiled_file;
+        pb::internal::CompiledFile compiled_file;
         if (!input_stream.ReadCompiledFile(&compiled_file)) {
           context_->GetDiagnostics()->Error(DiagMessage(src)
                                             << "failed to read compiled file header");