1 files changed, 16 insertions, 10 deletions

diff --git a/tools/aapt2/test/Context.h b/tools/aapt2/test/Context.h
index 96752d33dd9a..b053e07eafde 100644
--- a/tools/aapt2/test/Context.h
+++ b/tools/aapt2/test/Context.h
@@ -19,7 +19,6 @@
 
 #include "NameMangler.h"
 #include "util/Util.h"
-
 #include "process/IResourceTableConsumer.h"
 #include "process/SymbolTable.h"
 #include "test/Common.h"
@@ -40,7 +39,7 @@ public:
         return &mDiagnostics;
     }
 
-    const std::u16string& getCompilationPackage() override {
+    const std::string& getCompilationPackage() override {
         assert(mCompilationPackage && "package name not set");
         return mCompilationPackage.value();
     }
@@ -58,17 +57,19 @@ public:
         return false;
     }
 
+    int getMinSdkVersion() override {
+        return mMinSdkVersion;
+    }
+
 private:
     friend class ContextBuilder;
 
-    Context() : mNameMangler({}) {
-    }
-
-    Maybe<std::u16string> mCompilationPackage;
+    Maybe<std::string> mCompilationPackage;
     Maybe<uint8_t> mPackageId;
     StdErrDiagnostics mDiagnostics;
     SymbolTable mSymbols;
-    NameMangler mNameMangler;
+    NameMangler mNameMangler = NameMangler({});
+    int mMinSdkVersion = 0;
 };
 
 class ContextBuilder {
@@ -76,7 +77,7 @@ private:
     std::unique_ptr<Context> mContext = std::unique_ptr<Context>(new Context());
 
 public:
-    ContextBuilder& setCompilationPackage(const StringPiece16& package) {
+    ContextBuilder& setCompilationPackage(const StringPiece& package) {
         mContext->mCompilationPackage = package.toString();
         return *this;
     }
@@ -96,6 +97,11 @@ public:
         return *this;
     }
 
+    ContextBuilder& setMinSdkVersion(int minSdk) {
+        mContext->mMinSdkVersion = minSdk;
+        return *this;
+    }
+
     std::unique_ptr<Context> build() {
         return std::move(mContext);
     }
@@ -103,7 +109,7 @@ public:
 
 class StaticSymbolSourceBuilder {
 public:
-    StaticSymbolSourceBuilder& addPublicSymbol(const StringPiece16& name, ResourceId id,
+    StaticSymbolSourceBuilder& addPublicSymbol(const StringPiece& name, ResourceId id,
                                                std::unique_ptr<Attribute> attr = {}) {
         std::unique_ptr<SymbolTable::Symbol> symbol = util::make_unique<SymbolTable::Symbol>(
                 id, std::move(attr), true);
@@ -113,7 +119,7 @@ public:
         return *this;
     }
 
-    StaticSymbolSourceBuilder& addSymbol(const StringPiece16& name, ResourceId id,
+    StaticSymbolSourceBuilder& addSymbol(const StringPiece& name, ResourceId id,
                                          std::unique_ptr<Attribute> attr = {}) {
         std::unique_ptr<SymbolTable::Symbol> symbol = util::make_unique<SymbolTable::Symbol>(
                 id, std::move(attr), false);