summaryrefslogtreecommitdiffstats
path: root/src/intel
diff options
context:
space:
mode:
authorTapani Pälli <[email protected]>2017-07-31 11:32:33 +0300
committerTapani Pälli <[email protected]>2017-08-02 10:30:50 +0300
commit9bd15da85da7f51acd0d0be2ad9b9d4cb8b8992d (patch)
treeac7828a96120ad315e6e0b0cf43bf0c96af6483d /src/intel
parent341578a6aea31c13bc4dd04011fb0e48ac7db19e (diff)
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 <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/intel')
-rw-r--r--src/intel/Android.common.mk5
1 files changed, 5 insertions, 0 deletions
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)