commit b4f83ff6a99aad503463c178f57d737f0ba05679
author Jeremy Meyer <jakmcbane@google.com> Thu Nov 30 19:29:50 2023 +0000
committer Jeremy Meyer <jakmcbane@google.com> Thu Nov 30 11:58:16 2023 -0800
tree c79a52636c9e9106be90cbcebefbf5894cecf1bc
parent ee26e36bde533955663a99e225fc93ed6da7148d

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

tools/aapt2/java/ProguardRules.cpp

diff --git a/tools/aapt2/java/ProguardRules.cpp b/tools/aapt2/java/ProguardRules.cpp
index 80a46d5..aef48fc 100644
--- a/tools/aapt2/java/ProguardRules.cpp
+++ b/tools/aapt2/java/ProguardRules.cpp
@@ -29,8 +29,8 @@
 #include "util/Util.h"
 #include "xml/XmlDom.h"
 
-using ::aapt::io::OutputStream;
 using ::aapt::text::Printer;
+using ::android::OutputStream;
 
 namespace aapt {
 namespace proguard {