commit 46c3c4fa51d4480901e333c1d6bf70e8b9c4f861
author Daniel Norman <danielnorman@google.com> Fri Aug 02 23:00:27 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 02 23:00:27 2019 +0000
tree ef6a1ce90c2b3b9374f02e3281fdbef43a597532
parent f72e89744d4ce8fcd859ba7e4e4365b62d1a24aa
parent 90528a8e97482c4e8e1dec3a2a474df51bf6372c

Merge "Fixes incorrect flag info for the inheritance hierarchy file."

init/host_init_verifier.cpp

diff --git a/init/host_init_verifier.cpp b/init/host_init_verifier.cpp
index a5a5b1b..dce3eda 100644
--- a/init/host_init_verifier.cpp
+++ b/init/host_init_verifier.cpp
@@ -171,12 +171,12 @@
 #include "generated_stub_builtin_function_map.h"
 
 void PrintUsage() {
-    std::cout << "usage: host_init_verifier [-p FILE] -k FILE <init rc file>\n"
+    std::cout << "usage: host_init_verifier [-p FILE] -i FILE <init rc file>\n"
                  "\n"
                  "Tests an init script for correctness\n"
                  "\n"
                  "-p FILE\tSearch this passwd file for users and groups\n"
-                 "-k FILE\tUse this file as a space-separated list of known interfaces\n"
+                 "-i FILE\tParse this JSON file for the HIDL interface inheritance hierarchy\n"
               << std::endl;
 }
 
@@ -217,7 +217,7 @@
     argc -= optind;
     argv += optind;
 
-    if (argc != 1) {
+    if (argc != 1 || interface_inheritance_hierarchy_file.empty()) {
         PrintUsage();
         return EXIT_FAILURE;
     }