From 80f0a6d3d0de5ea0798048b3ab6e3605f3118b19 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Thu, 15 Apr 2021 19:39:45 -0700
Subject: [PATCH] device.mk: install vulkan.gs101 unconditionally

We now have a prebuilt for this, so no longer need to disable it when
source isn't available.

Bug: 185066245
Test: build aosp_slider-userdebug w/o vendor/arm/mali/valhall, boot to home
Change-Id: If366112383743bd23798b8e0a4b305742ad415c8
---
 device.mk | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/device.mk b/device.mk
index 92c1b42f..0855c70b 100644
--- a/device.mk
+++ b/device.mk
@@ -851,7 +851,8 @@ PRODUCT_PACKAGES += \
 	libRSDriverArm32 \
 	libbccArm32 \
 	libmalicore32 \
-	libOpenCL32
+	libOpenCL32 \
+	vulkan.gs10132
 endif
 
 PRODUCT_PACKAGES += \
@@ -861,17 +862,11 @@ PRODUCT_PACKAGES += \
 	libbccArm \
 	libmalicore \
 	libOpenCL \
+	vulkan.gs101 \
 	whitelist \
 	libstagefright_hdcp \
 	libskia_opt
 
-ifneq (,$(realpath $(TOPDIR)vendor/arm/mali/valhall/Android.bp))
-# TODO: fix the prebuilts to properly define and install this target
-# rather than simply making a symlink
-PRODUCT_PACKAGES += \
-	vulkan.gs101
-endif
-
 ifeq ($(USE_SWIFTSHADER),true)
 PRODUCT_PACKAGES += \
 	libGLESv1_CM_swiftshader \