android: link libmesa_intel_common with zlib and expat

Makes it possible to build Mesa on Android with -DDEBUG with
the next patch that reverts 4f695731.

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/src/intel/Android.common.mk b/src/intel/Android.common.mk
index f056f0a9df0c8fcde0ced2a74446492d794030de..12cea6e54727ced9e7a3fc724110df39e955f055 100644 (file)
--- a/src/intel/Android.common.mk
+++ b/src/intel/Android.common.mk
@@ -32,10 +32,15 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_SRC_FILES := $(COMMON_FILES)
 
 LOCAL_C_INCLUDES := \
+       external/zlib \
        $(MESA_TOP)/src/gallium/include \
        $(MESA_TOP)/src/gallium/auxiliary \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/mesa
 
+LOCAL_SHARED_LIBRARIES := libexpat libz
+
+LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
+
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)