commit 7e84c97b402afbbfa56d122d0c7c6de9f5e679fb
author Yifan Hong <elsk@google.com> Tue Nov 17 00:25:10 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 17 00:25:10 2020 +0000
tree ea2265037d3761a63e5a4f82638b2510301cf5d3
parent d49316f9c625a7fc3b1451b58592bb3603235d2c
parent ac448a3f8d48188f039e801063766af27d9e6135

VTS proto fuzz: decouple with libvintf. am: d9d6046d45 am: ac448a3f8d

Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/fuzz/+/1495300

Change-Id: I2ac73180704c9d250c36177ebb46855439f04597

iface_fuzzer/Android.bp

diff --git a/iface_fuzzer/Android.bp b/iface_fuzzer/Android.bp
index a93d564..d8eab99 100644
--- a/iface_fuzzer/Android.bp
+++ b/iface_fuzzer/Android.bp
@@ -37,8 +37,9 @@
     ],
     shared_libs: [
         "libbase",
+        "libhidlbase",
         "libprotobuf-cpp-full",
-        "libvintf",
+        "libutils",
         "libvts_common",
         "libvts_multidevice_proto",
         "libvts_proto_fuzzer_proto",

iface_fuzzer/ProtoFuzzerRunner.cpp

diff --git a/iface_fuzzer/ProtoFuzzerRunner.cpp b/iface_fuzzer/ProtoFuzzerRunner.cpp
index ed822a2..ff373b1 100644
--- a/iface_fuzzer/ProtoFuzzerRunner.cpp
+++ b/iface_fuzzer/ProtoFuzzerRunner.cpp
@@ -17,16 +17,14 @@
 #include "ProtoFuzzerRunner.h"
 
 #include <dlfcn.h>
+
 #include <sstream>
 
+#include <hidl/ServiceManagement.h>
+
 #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 android::hardware::getAllHalInstanceNames;
 using std::cerr;
 using std::cout;
 using std::string;
@@ -55,12 +53,10 @@
   string hal_name = comp_spec.package();
   string iface_name = comp_spec.component_name();
 
-  auto instance_names =
-      ::android::vintf::VintfObject::GetDeviceHalManifest()->getHidlInstances(
-          hal_name,
-          Version(comp_spec.component_type_version_major(),
-                  comp_spec.component_type_version_minor()),
-          iface_name);
+  auto descriptor =
+      hal_name + "@" + GetVersionString(comp_spec) + "::" + iface_name;
+  auto instance_names = getAllHalInstanceNames(descriptor);
+
   if (instance_names.empty()) {
     cerr << "HAL service name not available in VINTF." << endl;
     std::abort();

iface_fuzzer/ProtoFuzzerStaticParams.cpp

diff --git a/iface_fuzzer/ProtoFuzzerStaticParams.cpp b/iface_fuzzer/ProtoFuzzerStaticParams.cpp
index 27a1e9e..2f0133a 100644
--- a/iface_fuzzer/ProtoFuzzerStaticParams.cpp
+++ b/iface_fuzzer/ProtoFuzzerStaticParams.cpp
@@ -19,7 +19,7 @@
 #include <android-base/file.h>
 #include <android-base/macros.h>
 #include <android-base/strings.h>
-#include <vintf/VintfObject.h>
+#include <hidl/ServiceManagement.h>
 
 #define STRINGIFY(x) STRINGIFY_INTERNAL(x)
 #define STRINGIFY_INTERNAL(x) #x
@@ -28,8 +28,7 @@
 using android::base::GetExecutableDirectory;
 using android::base::Join;
 using android::base::Split;
-using android::vintf::Version;
-using android::vintf::VintfObject;
+using android::hardware::getAllHalInstanceNames;
 using std::cerr;
 using std::cout;
 using std::string;
@@ -51,12 +50,8 @@
         major_version == spec.component_type_version_major() &&
         minor_version == spec.component_type_version_minor()) {
       auto iface_name = spec.component_name();
-      auto instance_names =
-          VintfObject::GetDeviceHalManifest()->getHidlInstances(
-              package,
-              Version(spec.component_type_version_major(),
-                      spec.component_type_version_minor()),
-              iface_name);
+      auto descriptor = package_and_version.string() + "::" + iface_name;
+      auto instance_names = getAllHalInstanceNames(descriptor);
 
       if (!instance_names.empty()) {
         auto version =