diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-10-20 19:15:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-20 19:15:54 +0000 |
| commit | 7fd74b5ad1df53b92f08a9aa2f3d445bf7b786fe (patch) | |
| tree | 03bbf941ec0fead1ad64ba2acd06113486a612c1 /tools/aapt2/configuration/ConfigurationParser.cpp | |
| parent | 4bf7416a062af25574f548846e60e88df332cc55 (diff) | |
| parent | e59f0d80ec19249f72c07ae191ad673d040443e3 (diff) | |
Merge changes I1a4b3ce5,Id7216e5b
* changes:
AAPT2: Enable building proto artifacts
AAPT2: Define and Implement AAPT Container Format
Diffstat (limited to 'tools/aapt2/configuration/ConfigurationParser.cpp')
| -rw-r--r-- | tools/aapt2/configuration/ConfigurationParser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/configuration/ConfigurationParser.cpp b/tools/aapt2/configuration/ConfigurationParser.cpp index a79a577c663b..b99240f0a40a 100644 --- a/tools/aapt2/configuration/ConfigurationParser.cpp +++ b/tools/aapt2/configuration/ConfigurationParser.cpp @@ -30,7 +30,7 @@ #include "ResourceUtils.h" #include "io/File.h" #include "io/FileSystem.h" -#include "io/StringInputStream.h" +#include "io/StringStream.h" #include "util/Files.h" #include "util/Maybe.h" #include "util/Util.h" |