diff options
| author | Derek Morton <derek.j.morton@intel.com> | 2016-01-11 13:32:04 +0000 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2016-01-15 15:56:59 +0000 |
| commit | 825482a25c3efd82ad4630169d62248b06be4bc0 (patch) | |
| tree | 5f2693b374bba1434cf410358cdf0926246b137c /tools | |
| parent | fe7a42bff6c09cda864021d291a842ffd563e30e (diff) | |
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>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/Android.mk b/tools/Android.mk index 934d3a16..da4f3c06 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 |