commit a32b7548a5f14d5eebf7f0ab6ad10f12a7ca4f73
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 12 05:01:31 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 12 05:01:31 2018 +0000
tree 2c02b17731189b721e67a4d62e1d55e15664647d
parent 4f67f3bf621fa4162e07bd7d015b81e915ad4d44
parent 9e1f9406209eaf280ed3c660dc267c99c51f8e1a

Merge "Do not add empty <vndk> tag to device compatibility matrix"

AssembleVintf.cpp

diff --git a/AssembleVintf.cpp b/AssembleVintf.cpp
index d2a0b8f..a3f2838 100644
--- a/AssembleVintf.cpp
+++ b/AssembleVintf.cpp
@@ -256,14 +256,6 @@
         return ret;
     }
 
-    static std::string getFileNameFromPath(std::string path) {
-        auto idx = path.find_last_of("\\/");
-        if (idx != std::string::npos) {
-            path.erase(0, idx + 1);
-        }
-        return path;
-    }
-
     std::basic_ostream<char>& out() const { return mOutRef == nullptr ? std::cout : *mOutRef; }
 
     template <typename S>
@@ -465,7 +457,7 @@
             out() << "    Input:" << std::endl;
             for (const auto& e : *matrices) {
                 if (!e.name.empty()) {
-                    out() << "        " << getFileNameFromPath(e.name) << std::endl;
+                    out() << "        " << base::Basename(e.name) << std::endl;
                 }
             }
             out() << "-->" << std::endl;