[Intel-gfx] [PATCH i-g-t] tools/Android.mk: Add zlib support

[Morton, Derek J]

Can this be merged so IGT on Android builds? No one has raise any objections since Monday about this patch.

//Derek

-----Original Message-----
From: Morton, Derek J 
Sent: Monday, January 11, 2016 1:32 PM
To: intel-gfx at lists.freedesktop.org
Cc: Wood, Thomas; Gore, Tim; chris at chris-wilson.co.uk; Morton, Derek J
Subject: [PATCH] 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.

Signed-off-by: Derek Morton <derek.j.morton at intel.com>
---
 tools/Android.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/Android.mk b/tools/Android.mk index 934d3a1..da4f3c0 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -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
--
1.9.1