dragonboards: Allow use of new mesa/main build
Update the db845c/rb5 build to use the mesa/main build targets
if they are available.
We still keep the libGLES_mesa target, so we can still properly
build with AOSP's mesa branch.
This just allows us to easily test upstream mesa.
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: Icc8e3fedecb72a458a8419a1fe8bbb326fbe4b87
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 887a6f0..9b19707 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -53,8 +53,12 @@
# Mesa DRM hwcomposer
BOARD_USES_DRM_HWCOMPOSER := true
-BOARD_GPU_DRIVERS := freedreno virgl
+BOARD_GPU_DRIVERS := freedreno
TARGET_USES_HWC2 := true
+BOARD_MESA3D_USES_MESON_BUILD := true
+BOARD_MESA3D_GALLIUM_DRIVERS := freedreno
+BOARD_MESA3D_VULKAN_DRIVERS := freedreno
+
# WiFi
WPA_SUPPLICANT_VERSION := VER_0_8_X
diff --git a/device-common.mk b/device-common.mk
index 9635f7b..e781d2a 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -72,7 +72,12 @@
PRODUCT_PACKAGES += \
android.hardware.drm@1.3-service.clearkey \
android.hardware.drm@1.3-service.widevine \
- libGLES_mesa
+ libGLES_mesa \
+ libEGL_mesa \
+ libGLESv1_CM_mesa \
+ libGLESv2_mesa \
+ libgallium_dri \
+ libglapi
PRODUCT_PROPERTY_OVERRIDES += \
ro.hardware.gralloc=minigbm_msm \