From patchwork Wed Apr 19 11:01:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arkadiusz Hiler X-Patchwork-Id: 9687291 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B37D4602DC for ; Wed, 19 Apr 2017 11:02:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A343C283F4 for ; Wed, 19 Apr 2017 11:02:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96C37283FE; Wed, 19 Apr 2017 11:02:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5685A283F4 for ; Wed, 19 Apr 2017 11:02:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 900F76E2D4; Wed, 19 Apr 2017 11:02:42 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id E13176E2D4 for ; Wed, 19 Apr 2017 11:02:41 +0000 (UTC) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Apr 2017 04:02:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,221,1488873600"; d="scan'208";a="89670317" Received: from ahiler-desk.igk.intel.com ([172.28.171.131]) by orsmga005.jf.intel.com with ESMTP; 19 Apr 2017 04:02:41 -0700 From: Arkadiusz Hiler To: intel-gfx@lists.freedesktop.org Date: Wed, 19 Apr 2017 13:01:54 +0200 Message-Id: <20170419110155.6828-13-arkadiusz.hiler@intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170419110155.6828-1-arkadiusz.hiler@intel.com> References: <20170419110155.6828-1-arkadiusz.hiler@intel.com> Organization: Intel Technology Poland sp. z o.o. - KRS 101882 - ul. Slowackiego 173, 80-298 Gdansk Subject: [Intel-gfx] [PATCH i-g-t 12/13] tools/Android.mk: Fix zlib inclusion 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-Virus-Scanned: ClamAV using ClamSMTP Add dependency on libz instead of doing path magic. Signed-off-by: Arkadiusz Hiler --- tools/Android.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/Android.mk b/tools/Android.mk index 5653572..96075c9 100644 --- a/tools/Android.mk +++ b/tools/Android.mk @@ -29,9 +29,8 @@ define add_tool LOCAL_LDFLAGS += $($(1)_LDFLAGS) endif - LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib - LOCAL_C_INCLUDES += $(LOCAL_PATH)/../lib/stubs/drm/ - LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/zlib + LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib \ + $(LOCAL_PATH)/../lib/stubs/drm/ LOCAL_MODULE := $1_tool LOCAL_MODULE_TAGS := optional @@ -41,7 +40,8 @@ define add_tool LOCAL_SHARED_LIBRARIES := libpciaccess \ libkmod \ libdrm \ - libdrm_intel + libdrm_intel \ + libz # Tools dir on host LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/$(LOCAL_TOOLS_DIR)