From 9bd15da85da7f51acd0d0be2ad9b9d4cb8b8992d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Mon, 31 Jul 2017 11:32:33 +0300 Subject: [PATCH] android: link libmesa_intel_common with zlib and expat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Makes it possible to build Mesa on Android with -DDEBUG with the next patch that reverts 4f695731. Signed-off-by: Tapani Pälli Reviewed-by: Emil Velikov --- src/intel/Android.common.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/intel/Android.common.mk b/src/intel/Android.common.mk index f056f0a9df0..12cea6e5472 100644 --- 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)