Revert "Add getTransportFromManifest"
This reverts commit fba2495bc608f7c488fb74f0c8b6c252b3fe6669.
Change-Id: Idefe5d80e86af072c41c635cb24754f2ec352196
diff --git a/base/Android.bp b/base/Android.bp
index 2282ddf..f2f5ab0 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -16,15 +16,13 @@
name: "libhidlbase",
shared_libs: [
"libbase",
- "libcutils",
"liblog",
"libutils",
- "libvintf",
+ "libcutils",
],
export_shared_lib_headers: [
"libbase",
"libutils",
- "libvintf",
],
local_include_dirs: ["include"],
export_include_dirs: ["include"],
diff --git a/base/HidlSupport.cpp b/base/HidlSupport.cpp
index a89e88b..ef82775 100644
--- a/base/HidlSupport.cpp
+++ b/base/HidlSupport.cpp
@@ -18,7 +18,6 @@
#include <hidl/HidlSupport.h>
#include <android-base/logging.h>
-#include <vintf/VendorManifest.h>
#ifdef LIBHIDL_TARGET_DEBUGGABLE
#include <cutils/properties.h>
@@ -30,20 +29,6 @@
namespace android {
namespace hardware {
-vintf::Transport getTransportFromManifest(const std::string &iface) {
- const vintf::VendorManifest *vm = vintf::VendorManifest::Get();
- if (vm == nullptr) {
- LOG(ERROR) << "Cannot find vendor interface manifest.";
- return vintf::Transport::EMPTY;
- }
- auto it = vm->hals.find(iface);
- if (it == vm->hals.end()) {
- LOG(ERROR) << "Vendor interface manifest does not contain entry for " << iface;
- return vintf::Transport::EMPTY;
- }
- return it->second.transport;
-}
-
static const char *const kEmptyString = "";
hidl_string::hidl_string()
diff --git a/base/include/hidl/HidlSupport.h b/base/include/hidl/HidlSupport.h
index acc6347..b9e4ffa 100644
--- a/base/include/hidl/HidlSupport.h
+++ b/base/include/hidl/HidlSupport.h
@@ -34,7 +34,6 @@
#include <utils/Errors.h>
#include <utils/RefBase.h>
#include <utils/StrongPointer.h>
-#include <vintf/Transport.h>
#include <vector>
namespace android {
@@ -59,8 +58,6 @@
namespace hardware {
-vintf::Transport getTransportFromManifest(const std::string &iface);
-
// hidl_death_recipient is a callback interfaced that can be used with
// linkToDeath() / unlinkToDeath()
struct hidl_death_recipient : public virtual RefBase {