commit 74f5bc1e0d5b95e1d94fce0dffa88b18dc92cd51
author Tri Vo <trong@google.com> Thu Nov 02 19:53:06 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 02 19:53:06 2017 +0000
tree cac4d9927683b22c584428d30e4f193bc6fa9333
parent 51bdaee264b4a25fcf3f8ac56160e599ce122361
parent 72e8fc3d28f44e6e9338ed53b727ebab92bd42ff

Merge changes from topic "vts_fuzz_cp"

* changes:
  Increase memory allocated to fuzzer to 16Mb.
  Collect logcat during fuzz test run.
  Increase fuzzer run timeout to 10 min.

iface_fuzzer/ProtoFuzzerRunner.cpp

diff --git a/iface_fuzzer/ProtoFuzzerRunner.cpp b/iface_fuzzer/ProtoFuzzerRunner.cpp
index 923241e..0088c14 100644
--- a/iface_fuzzer/ProtoFuzzerRunner.cpp
+++ b/iface_fuzzer/ProtoFuzzerRunner.cpp
@@ -21,9 +21,11 @@
 
 #include "utils/InterfaceSpecUtil.h"
 #include "vintf/HalManifest.h"
+#include "vintf/Version.h"
 #include "vintf/VintfObject.h"
 
 using android::vintf::HalManifest;
+using android::vintf::Version;
 
 using std::cerr;
 using std::cout;
@@ -46,11 +48,17 @@
 
 static string GetServiceName(const CompSpec &comp_spec) {
   string hal_name = comp_spec.package();
+  string hal_version = GetVersionString(comp_spec.component_type_version());
   string iface_name = comp_spec.component_name();
 
+  size_t major_version =
+      std::stoul(hal_version.substr(0, hal_version.find(".")));
+  size_t minor_version =
+      std::stoul(hal_version.substr(hal_version.find(".") + 1));
+
   auto instance_names =
       ::android::vintf::VintfObject::GetDeviceHalManifest()->getInstances(
-          hal_name, iface_name);
+          hal_name, Version(major_version, minor_version), iface_name);
   if (instance_names.empty()) {
     cerr << "HAL service name not available in VINTF." << endl;
     std::abort();