commit 1f6e72fecff2341352656f03c6664320d47e1082
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 10 02:07:57 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 10 02:07:57 2016 +0000
tree c60a401b7aa269a526734fcec07a48ef32db06e5
parent ff959cd516f4c49b922ab61f180a65c40fdeba50
parent af33038299b5f5ad5022e15ed0264275e516eed7

Merge "Better error message when missing root path."

main.cpp

diff --git a/main.cpp b/main.cpp
index b85df57..29de12c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1207,7 +1207,12 @@
         packageRoots.push_back("android.hardware");
 
         const char *TOP = getenv("TOP");
-        CHECK(TOP != NULL);
+        if (TOP == nullptr) {
+            fprintf(stderr,
+                    "ERROR: No root path (-r) specified"
+                    " and $TOP environment variable not set.\n");
+            exit(1);
+        }
 
         std::string path = TOP;
         path.append("/hardware/interfaces");