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/cmd/Compile.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/cmd/Compile.cpp')
| -rw-r--r-- | tools/aapt2/cmd/Compile.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt2/cmd/Compile.cpp b/tools/aapt2/cmd/Compile.cpp index 8060a8de4629..fc9514a691d2 100644 --- a/tools/aapt2/cmd/Compile.cpp +++ b/tools/aapt2/cmd/Compile.cpp @@ -22,11 +22,11 @@ #include "android-base/errors.h" #include "android-base/file.h" #include "android-base/utf8.h" +#include "androidfw/ConfigDescription.h" #include "androidfw/StringPiece.h" #include "google/protobuf/io/coded_stream.h" #include "google/protobuf/io/zero_copy_stream_impl_lite.h" -#include "ConfigDescription.h" #include "Diagnostics.h" #include "ResourceParser.h" #include "ResourceTable.h" @@ -53,6 +53,7 @@ using ::aapt::io::FileInputStream; using ::aapt::text::Printer; +using ::android::ConfigDescription; using ::android::StringPiece; using ::android::base::SystemErrorCodeToString; using ::google::protobuf::io::CopyingOutputStreamAdaptor; |