diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-09-29 14:49:15 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2017-10-04 14:26:55 -0700 |
| commit | 4670805ea441edb8b280f9312571e7799f1284cf (patch) | |
| tree | 593cfa51011a51f443e9dbaa5934ea159e7ae1d7 /tools/aapt2/optimize | |
| parent | 65e91ce6c3aac8e350cbf5e1de2d2b13c78d792b (diff) | |
AAPT2: Move format related files under same directory
Test: make aapt2_tests
Change-Id: Id72cdfc12ba3add294048e60c55f2461344464bf
Diffstat (limited to 'tools/aapt2/optimize')
| -rw-r--r-- | tools/aapt2/optimize/MultiApkGenerator.cpp | 4 | ||||
| -rw-r--r-- | tools/aapt2/optimize/MultiApkGenerator_test.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/aapt2/optimize/MultiApkGenerator.cpp b/tools/aapt2/optimize/MultiApkGenerator.cpp index 8e4b82c6c261..680308871af7 100644 --- a/tools/aapt2/optimize/MultiApkGenerator.cpp +++ b/tools/aapt2/optimize/MultiApkGenerator.cpp @@ -27,8 +27,8 @@ #include "configuration/ConfigurationParser.h" #include "filter/AbiFilter.h" #include "filter/Filter.h" -#include "flatten/Archive.h" -#include "flatten/XmlFlattener.h" +#include "format/Archive.h" +#include "format/binary/XmlFlattener.h" #include "optimize/VersionCollapser.h" #include "process/IResourceTableConsumer.h" #include "split/TableSplitter.h" diff --git a/tools/aapt2/optimize/MultiApkGenerator_test.cpp b/tools/aapt2/optimize/MultiApkGenerator_test.cpp index e8e6adc490e9..c8f3524748b6 100644 --- a/tools/aapt2/optimize/MultiApkGenerator_test.cpp +++ b/tools/aapt2/optimize/MultiApkGenerator_test.cpp @@ -25,8 +25,8 @@ #include "ResourceTable.h" #include "configuration/ConfigurationParser.h" #include "filter/Filter.h" -#include "flatten/Archive.h" -#include "flatten/TableFlattener.h" +#include "format/Archive.h" +#include "format/binary/TableFlattener.h" #include "process/IResourceTableConsumer.h" #include "test/Context.h" #include "test/Test.h" |