commit 3b4a3ea5ab347a9627901df9c4fd09073ef15dd2
author Yifan Hong <elsk@google.com> Fri Mar 13 18:44:22 2020 -0700
committer Yifan Hong <elsk@google.com> Tue Mar 17 01:36:54 2020 +0000
tree 4129d7f196f8ec37431c2b54d8856153975625f2
parent beef8fca434a33d6e80aa91fe266b35a357bbdef

check_vintf: --check-one accepts properties.

Fixes: 148601741
Test: with vendor SKU
Change-Id: I057c05d77cdfd3b7ed8dbdc7504dcb40407ee916
Merged-In: I057c05d77cdfd3b7ed8dbdc7504dcb40407ee916

check_vintf.cpp

diff --git a/check_vintf.cpp b/check_vintf.cpp
index d4dc3bc..b5a4553 100644
--- a/check_vintf.cpp
+++ b/check_vintf.cpp
@@ -362,13 +362,15 @@
     return vintfObject->checkCompatibility(error, flags);
 }
 
-int checkDirmaps(const Dirmap& dirmap) {
+int checkDirmaps(const Dirmap& dirmap, const Properties& props) {
+    auto hostPropertyFetcher = std::make_unique<PresetPropertyFetcher>();
+    hostPropertyFetcher->setProperties(props);
     auto exitCode = EX_OK;
     for (auto&& [prefix, mappedPath] : dirmap) {
         auto vintfObject =
             VintfObject::Builder()
                 .setFileSystem(std::make_unique<HostFileSystem>(dirmap, NAME_NOT_FOUND))
-                .setPropertyFetcher(std::make_unique<PropertyFetcherNoOp>())
+                .setPropertyFetcher(std::move(hostPropertyFetcher))
                 .setRuntimeInfoFactory(std::make_unique<StaticRuntimeInfoFactory>(nullptr))
                 .build();
 
@@ -439,9 +441,10 @@
     }
 
     auto dirmap = getDirmap(iterateValues(args, DIR_MAP));
+    auto properties = getProperties(iterateValues(args, PROPERTY));
 
     if (!iterateValues(args, CHECK_ONE).empty()) {
-        return checkDirmaps(dirmap);
+        return checkDirmaps(dirmap, properties);
     }
 
     auto checkCompat = iterateValues(args, CHECK_COMPAT);
@@ -458,8 +461,6 @@
         args.emplace(DIR_MAP, "/:" + *rootdirs.begin());
     }
 
-    auto properties = getProperties(iterateValues(args, PROPERTY));
-
     std::shared_ptr<StaticRuntimeInfo> runtimeInfo;
     auto kernelArgs = iterateValues(args, KERNEL);
     if (!kernelArgs.empty()) {