diff options
| author | 2023-11-30 19:29:50 +0000 | |
|---|---|---|
| committer | 2023-11-30 11:58:16 -0800 | |
| commit | b4f83ff6a99aad503463c178f57d737f0ba05679 (patch) | |
| tree | c79a52636c9e9106be90cbcebefbf5894cecf1bc /tools/aapt2/Main.cpp | |
| parent | ee26e36bde533955663a99e225fc93ed6da7148d (diff) | |
Revert^2 "Move some image/9patch code to androidfw"
This reverts commit 917043bc2586743afda5a21386893fa8c787800b.
Reason for revert: Roll forward with fix
Test: Automatic
Bug: 296324826
Change-Id: I42a0b48c02fd497b2174c0c65f300265202f7ab1
Diffstat (limited to 'tools/aapt2/Main.cpp')
| -rw-r--r-- | tools/aapt2/Main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/aapt2/Main.cpp b/tools/aapt2/Main.cpp index a0b4dab9b8e5..b351d6ee4f33 100644 --- a/tools/aapt2/Main.cpp +++ b/tools/aapt2/Main.cpp @@ -27,6 +27,7 @@ #include "Diagnostics.h" #include "android-base/stringprintf.h" #include "android-base/utf8.h" +#include "androidfw/FileStream.h" #include "androidfw/IDiagnostics.h" #include "androidfw/StringPiece.h" #include "cmd/ApkInfo.h" @@ -37,7 +38,6 @@ #include "cmd/Dump.h" #include "cmd/Link.h" #include "cmd/Optimize.h" -#include "io/FileStream.h" #include "trace/TraceBuffer.h" #include "util/Files.h" #include "util/Util.h" @@ -99,7 +99,7 @@ class MainCommand : public Command { */ class DaemonCommand : public Command { public: - explicit DaemonCommand(io::FileOutputStream* out, android::IDiagnostics* diagnostics) + explicit DaemonCommand(android::FileOutputStream* out, android::IDiagnostics* diagnostics) : Command("daemon", "m"), out_(out), diagnostics_(diagnostics) { SetDescription("Runs aapt in daemon mode. Each subsequent line is a single parameter to the\n" "command. The end of an invocation is signaled by providing an empty line."); @@ -147,7 +147,7 @@ class DaemonCommand : public Command { } private: - io::FileOutputStream* out_; + android::FileOutputStream* out_; android::IDiagnostics* diagnostics_; std::optional<std::string> trace_folder_; }; @@ -167,7 +167,7 @@ int MainImpl(int argc, char** argv) { // Use a smaller buffer so that there is less latency for printing to stdout. constexpr size_t kStdOutBufferSize = 1024u; - aapt::io::FileOutputStream fout(STDOUT_FILENO, kStdOutBufferSize); + android::FileOutputStream fout(STDOUT_FILENO, kStdOutBufferSize); aapt::text::Printer printer(&fout); aapt::StdErrDiagnostics diagnostics; |