Mesa (master): intel: Add missing includes for building on Android

[Kenneth Graunke]

Module: Mesa
Branch: master
Commit: d1fa30e0f8cdf17c592e9a3b121dd794a85e136a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d1fa30e0f8cdf17c592e9a3b121dd794a85e136a

Author: Clayton Craft <clayton.a.craft at intel.com>
Date:   Mon Mar  5 17:00:05 2018 -0800

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 at whitecape.org>

---

 src/intel/Android.mk                 | 1 +
 src/mesa/drivers/dri/i965/Android.mk | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/intel/Android.mk b/src/intel/Android.mk
index db6c770f35..380473d0ac 100644
--- 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 83959cbf6c..964313e6c5 100644
--- 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 \