From patchwork Mon Jan 11 13:32:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Morton X-Patchwork-Id: 8003771 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0B7939F32E for ; Mon, 11 Jan 2016 13:32:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1E00C201FE for ; Mon, 11 Jan 2016 13:32:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0966B202D1 for ; Mon, 11 Jan 2016 13:32:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D03CA6E4D3; Mon, 11 Jan 2016 05:32:18 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id B474B6E4D3 for ; Mon, 11 Jan 2016 05:32:16 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP; 11 Jan 2016 05:32:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,552,1444719600"; d="scan'208";a="888159944" Received: from djmorton-linux2.isw.intel.com ([10.102.226.90]) by orsmga002.jf.intel.com with ESMTP; 11 Jan 2016 05:32:09 -0800 From: Derek Morton To: intel-gfx@lists.freedesktop.org Date: Mon, 11 Jan 2016 13:32:04 +0000 Message-Id: <1452519124-36324-1-git-send-email-derek.j.morton@intel.com> X-Mailer: git-send-email 1.9.1 Cc: thomas.wood@intel.com Subject: [Intel-gfx] [PATCH] tools/Android.mk: Add zlib support X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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