commit 84918e618e6db35dfaf2d720c66db8b1b087f641
author Jesse Hall <jessehall@google.com> Mon Apr 09 07:45:52 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 09 07:45:52 2018 -0700
tree 6979863569bb7a683a4ad98496dd96179aac2ca5
parent e97f4792cac5683ec83f5587e5c8f0215b6de611
parent b381cb4932eb44b15052816c08d2063c83700115

Put Vulkan driver in the right place
am: b381cb4932

Change-Id: Ida7fa8cdecf9aa055354349a26d65003ef91e504

hikey960/device-hikey960.mk

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

mali/bifrost/Android.mk

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)