diff options
author | MÃ¥rten Kongstad <marten.kongstad@sony.com> | 2018-06-20 08:46:41 +0200 |
---|---|---|
committer | Todd Kennedy <toddke@google.com> | 2018-10-08 06:50:22 -0700 |
commit | 24c9aa65411207067f509c5e88ad31b303d26fcd (patch) | |
tree | 9a7405282c003f0c360c95bd051681733d765919 /tools/aapt2/ResourceTable.cpp | |
parent | ec5c04f4ab781938123e5f68569048cf65fddc14 (diff) |
libandroidfw: move ConfigDescription from aapt2 to libandroidfw
This is to allow idmap2 to access ConfigDescription.
Test: libandroidfw_tests
Test: aapt2_tests
Change-Id: I54210bbbd8dad5903cb7100807df977efa394ad5
Diffstat (limited to 'tools/aapt2/ResourceTable.cpp')
-rw-r--r-- | tools/aapt2/ResourceTable.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt2/ResourceTable.cpp b/tools/aapt2/ResourceTable.cpp index 23322ab277bf..056a27bf011d 100644 --- a/tools/aapt2/ResourceTable.cpp +++ b/tools/aapt2/ResourceTable.cpp @@ -23,9 +23,9 @@ #include "android-base/logging.h" #include "android-base/stringprintf.h" +#include "androidfw/ConfigDescription.h" #include "androidfw/ResourceTypes.h" -#include "ConfigDescription.h" #include "Debug.h" #include "NameMangler.h" #include "ResourceValues.h" @@ -34,6 +34,7 @@ #include "util/Util.h" using ::aapt::text::IsValidResourceEntryName; +using ::android::ConfigDescription; using ::android::StringPiece; using ::android::base::StringPrintf; |