From 4264917141fe1f4a38da5f0698c5cc87f7720f80 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Thu, 7 May 2020 12:48:54 -0700 Subject: Vulkan: remove the fallback path to load Vulkan driver This fallback loading path was for backwards compatibility with devices being upgraded from pre-Oreo (i.e. pre-Treble) to Oreo or later. Those devices weren't required to follow a lot of the Treble rules, so linker namespaces (or binaries compatible with them) couldn't be enforced. This change removes it so that we can discover issues around loading Vulkan driver from sphal namespace. Bug: 156021362 Test: build, flash and boot Change-Id: I505bdbdb40a06e1d837f1d0b75822b0c60de96c9 --- vulkan/libvulkan/driver.cpp | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'vulkan/libvulkan/driver.cpp') diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp index a5f0c9f803..7bcb2c1441 100644 --- a/vulkan/libvulkan/driver.cpp +++ b/vulkan/libvulkan/driver.cpp @@ -252,18 +252,6 @@ bool Hal::Open() { result = LoadUpdatedDriver(&module); if (result == -ENOENT) { result = LoadBuiltinDriver(&module); - if (result != 0) { - // -ENOENT means the sphal namespace doesn't exist, not that there - // is a problem with the driver. - ALOGW_IF( - result != -ENOENT, - "Failed to load Vulkan driver into sphal namespace. This " - "usually means the driver has forbidden library dependencies." - "Please fix, this will soon stop working."); - result = - hw_get_module(HWVULKAN_HARDWARE_MODULE_ID, - reinterpret_cast(&module)); - } } if (result != 0) { android::GraphicsEnv::getInstance().setDriverLoaded( -- cgit v1.2.3-59-g8ed1b