Put Vulkan driver in the right place
The Vulkan runtime only looks in /vendor/lib[64]/hw for the Vulkan HAL,
not in /vendor/lib[64]/ where it was being installed.
The current driver supports the features required by
FEATURE_VULKAN_HARDWARE_LEVEL=1, so advertise it as required by CTS
VulkanFeaturesTest.
Test: adb shell cmd gpu vkjson
Test: cts-tradefed run cts -m CtsGraphicsTestCases -t android.graphics.cts.VulkanFeaturesTest
Change-Id: I6fccf8a34da9ba303be698032c49b7211f9d3d89
diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk
index d901a5e..47b6bbe 100644
--- a/hikey960/device-hikey960.mk
+++ b/hikey960/device-hikey960.mk
@@ -23,7 +23,7 @@
device/linaro/hikey/init.common.usb.rc:root/init.hikey960.usb.rc \
device/linaro/hikey/ueventd.common.rc:root/ueventd.hikey960.rc \
device/linaro/hikey/common.kl:system/usr/keylayout/hikey960.kl \
- frameworks/native/data/etc/android.hardware.vulkan.level-0.xml:system/etc/permissions/android.hardware.vulkan.level.xml \
+ frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:system/etc/permissions/android.hardware.vulkan.level.xml \
frameworks/native/data/etc/android.hardware.vulkan.version-1_0_3.xml:system/etc/permissions/android.hardware.vulkan.version.xml
# Copy BT firmware
diff --git a/mali/bifrost/Android.mk b/mali/bifrost/Android.mk
index bb47d97..22fd3bd 100644
--- a/mali/bifrost/Android.mk
+++ b/mali/bifrost/Android.mk
@@ -71,8 +71,8 @@
LOCAL_STRIP_MODULE := false
LOCAL_SRC_FILES_arm := lib/hw/$(LOCAL_MODULE)
LOCAL_SRC_FILES_arm64 := lib64/hw/$(LOCAL_MODULE)
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib/
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/
+LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib/hw
+LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/hw
LOCAL_MULTILIB := both
include $(BUILD_PREBUILT)