intel: Add missing includes for building on Android

This adds a missing library to the i965/Android.mk file, and updates
intel/Android.mk to include the new library. Without this, mesa does not
build on Android.

Fixes: 272bef0601a "intel: Split gen_device_info out into
libintel_dev"

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/intel/Android.mk b/src/intel/Android.mk
index db6c770f358c7271f16e4d31e864a88ba183103a..380473d0acb2845264102b126f11816ce0177e4d 100644 (file)
--- a/src/intel/Android.mk
+++ b/src/intel/Android.mk
@@ -28,6 +28,7 @@ include $(LOCAL_PATH)/Makefile.sources
 include $(LOCAL_PATH)/Android.blorp.mk
 include $(LOCAL_PATH)/Android.common.mk
 include $(LOCAL_PATH)/Android.compiler.mk
+include $(LOCAL_PATH)/Android.dev.mk
 include $(LOCAL_PATH)/Android.genxml.mk
 include $(LOCAL_PATH)/Android.isl.mk
 include $(LOCAL_PATH)/Android.vulkan.mk

diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index 83959cbf6cd2bf6f4963a4f39bb98acc7d47576b..964313e6c5ead0b4ad6cc251be21e9f6628f886b 100644 (file)
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -289,6 +289,7 @@ LOCAL_SRC_FILES := \
 LOCAL_WHOLE_STATIC_LIBRARIES := \
        $(MESA_DRI_WHOLE_STATIC_LIBRARIES) \
        $(I965_PERGEN_LIBS) \
+       libmesa_intel_dev \
        libmesa_intel_common \
        libmesa_isl \
        libmesa_blorp \