commit 24c9aa65411207067f509c5e88ad31b303d26fcd
author Mårten Kongstad <marten.kongstad@sony.com> Wed Jun 20 08:46:41 2018 +0200
committer Todd Kennedy <toddke@google.com> Mon Oct 08 06:50:22 2018 -0700
tree 9a7405282c003f0c360c95bd051681733d765919
parent ec5c04f4ab781938123e5f68569048cf65fddc14

libandroidfw: move ConfigDescription from aapt2 to libandroidfw

This is to allow idmap2 to access ConfigDescription.

Test: libandroidfw_tests
Test: aapt2_tests
Change-Id: I54210bbbd8dad5903cb7100807df977efa394ad5

tools/aapt2/cmd/Dump.cpp

diff --git a/tools/aapt2/cmd/Dump.cpp b/tools/aapt2/cmd/Dump.cpp
index 91e3977..d80b5ea 100644
--- a/tools/aapt2/cmd/Dump.cpp
+++ b/tools/aapt2/cmd/Dump.cpp
@@ -20,6 +20,7 @@
 #include <vector>
 
 #include "android-base/stringprintf.h"
+#include "androidfw/ConfigDescription.h"
 #include "androidfw/StringPiece.h"
 
 #include "Debug.h"
@@ -233,12 +234,12 @@
   Printer printer(&fout);
 
   // Comparison function used to order configurations
-  auto compare = [](ConfigDescription c1, ConfigDescription c2) -> bool {
+  auto compare = [](android::ConfigDescription c1, android::ConfigDescription c2) -> bool {
       return c1.compare(c2) < 0;
   };
 
   // Insert the configurations into a set in order to keep every configuarion seen
-  std::set<ConfigDescription, decltype(compare)> configs(compare);
+  std::set<android::ConfigDescription, decltype(compare)> configs(compare);
   for (auto& package : table->packages) {
     for (auto& type : package->types) {
       for (auto& entry : type->entries) {