commit f7fa068fe10f7ba5df8c4352686e906486ebec0f
author Steven Moreland <smoreland@google.com> Thu May 11 16:14:55 2017 -0700
committer Steven Moreland <smoreland@google.com> Thu May 11 18:09:06 2017 -0700
tree 85fd57379af55f7bcc7917b2cadc7b6b0a37af26
parent 64f1b82a17efc0ddf8a768ca8b2f9fa237e64286

hidl-gen: allow specifying root

Also, default root to $ANDROID_BUILD_TOP or pwd if that isn't defined.

Now hidl-gen can be run from anywhere, not just croot.

Test: manual
Change-Id: I8a8ef57612ff4235772fb0a24e543ffd8c7a78c1
Bugs: me

Coordinator.cpp

diff --git a/Coordinator.cpp b/Coordinator.cpp
index 2a4d5d0..d0ef37f 100644
--- a/Coordinator.cpp
+++ b/Coordinator.cpp
@@ -44,9 +44,11 @@
 
 Coordinator::Coordinator(
         const std::vector<std::string> &packageRootPaths,
-        const std::vector<std::string> &packageRoots)
+        const std::vector<std::string> &packageRoots,
+        const std::string &rootPath)
     : mPackageRootPaths(packageRootPaths),
-      mPackageRoots(packageRoots) {
+      mPackageRoots(packageRoots),
+      mRootPath(rootPath) {
     // empty
 }
 
@@ -82,7 +84,7 @@
         // fall through.
     }
 
-    std::string path = getPackagePath(fqName);
+    std::string path = mRootPath + getPackagePath(fqName);
 
     path.append(fqName.name());
     path.append(".hal");
@@ -274,7 +276,7 @@
         std::vector<std::string> *fileNames) const {
     fileNames->clear();
 
-    const std::string packagePath = getPackagePath(package);
+    const std::string packagePath = mRootPath + getPackagePath(package);
 
     DIR *dir = opendir(packagePath.c_str());
 
@@ -411,7 +413,7 @@
     FQName prevPacakge = currentPackage;
     while (prevPacakge.getPackageMinorVersion() > 0) {
         prevPacakge = prevPacakge.downRev();
-        if (existdir(getPackagePath(prevPacakge).c_str())) {
+        if (existdir((mRootPath + getPackagePath(prevPacakge)).c_str())) {
             hasPrevPackage = true;
             break;
         }