diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-01-19 23:40:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-19 23:40:06 +0000 |
| commit | 1f9f11007db09bbbc156965e77b10de82a32a544 (patch) | |
| tree | e715a9edb691da38726c2c5487625bd35b05ec94 /tools/aapt2/Main.cpp | |
| parent | 12375e9e0d14868cf63c0d6584c7a7d9440c30c4 (diff) | |
| parent | d5083f6f6b9bc76bbe64052bcec639eee752a321 (diff) | |
Merge "Move StringPiece to libandroidfw"
Diffstat (limited to 'tools/aapt2/Main.cpp')
| -rw-r--r-- | tools/aapt2/Main.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/aapt2/Main.cpp b/tools/aapt2/Main.cpp index a2b216d01b11..74d40194e955 100644 --- a/tools/aapt2/Main.cpp +++ b/tools/aapt2/Main.cpp @@ -17,7 +17,7 @@ #include <iostream> #include <vector> -#include "util/StringPiece.h" +#include "androidfw/StringPiece.h" namespace aapt { @@ -33,10 +33,10 @@ int PrintVersion() { return 0; } -extern int Compile(const std::vector<StringPiece>& args); -extern int Link(const std::vector<StringPiece>& args); -extern int Dump(const std::vector<StringPiece>& args); -extern int Diff(const std::vector<StringPiece>& args); +extern int Compile(const std::vector<android::StringPiece>& args); +extern int Link(const std::vector<android::StringPiece>& args); +extern int Dump(const std::vector<android::StringPiece>& args); +extern int Diff(const std::vector<android::StringPiece>& args); } // namespace aapt @@ -45,12 +45,12 @@ int main(int argc, char** argv) { argv += 1; argc -= 1; - std::vector<aapt::StringPiece> args; + std::vector<android::StringPiece> args; for (int i = 1; i < argc; i++) { args.push_back(argv[i]); } - aapt::StringPiece command(argv[0]); + android::StringPiece command(argv[0]); if (command == "compile" || command == "c") { return aapt::Compile(args); } else if (command == "link" || command == "l") { |