Skip to contentSkip to conversation

tools/Android.mk: Add zlib support

PATCH New Derek Morton 1 participant 1 message Jan 11, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/Android.mk: Add zlib support

IGT does not build for Android due to a zlib dependency being added to intel_error_decode.c in a recent patch.
This patch fixes the error by updating the Android makefile to add the path to the zlib library and using any LDFLAGS specified in Makefile.sources.

---
 tools/Android.mk | 5 +++++
 1 file changed, 5 insertions(+)
tools/Android.mk +5 -0
index 934d3a1..da4f3c0 100644
@@ -23,9 +23,14 @@ define add_tool
     LOCAL_CFLAGS += -Wno-error=return-type
     # Excessive complaining for established cases. Rely on the Linux version warnings.
     LOCAL_CFLAGS += -Wno-sign-compare
+    ifeq ($($(1)_LDFLAGS),)
+    else
+        LOCAL_LDFLAGS += $($(1)_LDFLAGS)
+    endif
 
     LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib
     LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/PRIVATE/drm/include/drm
+    LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/zlib
 
     LOCAL_MODULE := $1_tool
     LOCAL_MODULE_TAGS := optional
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx