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/configuration/ConfigurationParser.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/configuration/ConfigurationParser.cpp')
| -rw-r--r-- | tools/aapt2/configuration/ConfigurationParser.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/aapt2/configuration/ConfigurationParser.cpp b/tools/aapt2/configuration/ConfigurationParser.cpp index 902334b98d00..dd06b38f6c01 100644 --- a/tools/aapt2/configuration/ConfigurationParser.cpp +++ b/tools/aapt2/configuration/ConfigurationParser.cpp @@ -25,8 +25,8 @@ #include "android-base/file.h" #include "android-base/logging.h" +#include "androidfw/ConfigDescription.h" -#include "ConfigDescription.h" #include "Diagnostics.h" #include "ResourceUtils.h" #include "configuration/ConfigurationParser.internal.h" @@ -40,6 +40,8 @@ #include "xml/XmlDom.h" #include "xml/XmlUtil.h" +using ::android::ConfigDescription; + namespace aapt { namespace { |