commit 56f36e8f2fa808128bc68d4ae9adad9e65b90367
author Jeremy Meyer <jakmcbane@google.com> Fri May 20 20:35:42 2022 +0000
committer Jeremy Meyer <jakmcbane@google.com> Tue May 31 23:43:03 2022 +0000
tree 07b10081f9a44efde8a3b1cc0c33264253451ca8
parent 14be35a5de080e7ae797edbecd94e0684244d647

Move StringPool to libandroidfw

Test: verified affected tests pass
Bug: 232940948
Change-Id: I22089893d7e5013f759c39ce190bec07fa6435db

tools/aapt2/test/Common.cpp

diff --git a/tools/aapt2/test/Common.cpp b/tools/aapt2/test/Common.cpp
index e029d02..eca0c1c 100644
--- a/tools/aapt2/test/Common.cpp
+++ b/tools/aapt2/test/Common.cpp
@@ -21,8 +21,8 @@
 namespace aapt {
 namespace test {
 
-struct TestDiagnosticsImpl : public IDiagnostics {
-  void Log(Level level, DiagMessageActual& actual_msg) override {
+struct TestDiagnosticsImpl : public android::IDiagnostics {
+  void Log(Level level, android::DiagMessageActual& actual_msg) override {
     switch (level) {
       case Level::Note:
         return;
@@ -38,7 +38,7 @@
   }
 };
 
-IDiagnostics* GetDiagnostics() {
+android::IDiagnostics* GetDiagnostics() {
   static TestDiagnosticsImpl diag;
   return &diag;
 }