From patchwork Fri Jan 15 15:49:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Morton X-Patchwork-Id: 8042821 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CA837BEEE5 for ; Fri, 15 Jan 2016 15:49:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 07C0420453 for ; Fri, 15 Jan 2016 15:49:06 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 1F80E202F2 for ; Fri, 15 Jan 2016 15:49:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 425386E171; Fri, 15 Jan 2016 07:49:04 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 405CD6E171 for ; Fri, 15 Jan 2016 07:49:03 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP; 15 Jan 2016 07:49:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,300,1449561600"; d="scan'208";a="882072369" Received: from irsmsx110.ger.corp.intel.com ([163.33.3.25]) by fmsmga001.fm.intel.com with ESMTP; 15 Jan 2016 07:49:03 -0800 Received: from irsmsx102.ger.corp.intel.com ([169.254.2.131]) by irsmsx110.ger.corp.intel.com ([163.33.3.25]) with mapi id 14.03.0248.002; Fri, 15 Jan 2016 15:49:00 +0000 From: "Morton, Derek J" To: "intel-gfx@lists.freedesktop.org" Thread-Topic: [PATCH i-g-t] tools/Android.mk: Add zlib support Thread-Index: AdFPrBPtT4PTAP9gRwas3YeaKeOznQ== Date: Fri, 15 Jan 2016 15:49:00 +0000 Message-ID: <2D016F5BA44C744783BA96B1D3EBC5BD13EFA714@IRSMSX102.ger.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.180] MIME-Version: 1.0 Cc: "Wood, Thomas" Subject: Re: [Intel-gfx] [PATCH i-g-t] 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: , 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 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 --- tools/Android.mk | 5 +++++ 1 file changed, 5 insertions(+) -- 1.9.1 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