From: "Morton, Derek J" <derek.j.morton@intel.com>
To: "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>
Cc: "Wood, Thomas" <thomas.wood@intel.com>
Subject: Re: [PATCH i-g-t] tools/Android.mk: Add zlib support
Date: Fri, 15 Jan 2016 15:49:00 +0000 [thread overview]
Message-ID: <2D016F5BA44C744783BA96B1D3EBC5BD13EFA714@IRSMSX102.ger.corp.intel.com> (raw)
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@lists.freedesktop.org
Cc: Wood, Thomas; Gore, Tim; chris@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@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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2016-01-15 15:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-15 15:49 Morton, Derek J [this message]
2016-01-15 15:59 ` [PATCH i-g-t] tools/Android.mk: Add zlib support Damien Lespiau
2020-02-13 22:50 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2D016F5BA44C744783BA96B1D3EBC5BD13EFA714@IRSMSX102.ger.corp.intel.com \
--to=derek.j.morton@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=thomas.wood@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).