From patchwork Fri Jan 31 14:57:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rafael.barbalho@intel.com X-Patchwork-Id: 3563481 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BB715C02DC for ; Fri, 31 Jan 2014 20:06:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A0AEE2024F for ; Fri, 31 Jan 2014 20:06:47 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C320C2022F for ; Fri, 31 Jan 2014 20:06:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 416E2107138 for ; Fri, 31 Jan 2014 12:06:45 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id B2B19F9CDF for ; Fri, 31 Jan 2014 06:57:52 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 31 Jan 2014 06:57:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,758,1384329600"; d="scan'208";a="475830708" Received: from rbarbalh-linux.isw.intel.com ([10.102.226.47]) by orsmga002.jf.intel.com with ESMTP; 31 Jan 2014 06:57:51 -0800 From: rafael.barbalho@intel.com To: intel-gfx@lists.freedesktop.org Date: Fri, 31 Jan 2014 14:57:37 +0000 Message-Id: <1391180260-23101-3-git-send-email-rafael.barbalho@intel.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1391180260-23101-1-git-send-email-rafael.barbalho@intel.com> References: <1391180260-23101-1-git-send-email-rafael.barbalho@intel.com> Subject: [Intel-gfx] [PATCH 2/5] android: Clean-up common makefile directives X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.8 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 From: Rafael Barbalho All the Android.mk files had the same directives to find the path of libdrm & libpciaccess. These are no longer required as the android system now allows the libraries being used to export include paths to dependant modules & programs. Signed-off-by: Rafael Barbalho --- tests/Android.mk | 20 +------------------- tools/Android.mk | 20 +------------------- 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/tests/Android.mk b/tests/Android.mk index abccb7f..0e292a9 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -1,21 +1,6 @@ include $(LOCAL_PATH)/tests/Makefile.sources include $(LOCAL_PATH)/lib/Makefile.sources -LIBPCIACCESS_PATH := $(firstword $(wildcard \ - $(TOP)/external/PRIVATE/libpciaccess \ - $(TOP)/hardware/intel/libpciaccess \ - $(TOP)/external/libpciaccess)) -ifeq ($(LIBPCIACCESS_PATH),) - $(error "Unable to find libpciaccess!") -endif - -LIBDRM_PATH := $(firstword $(wildcard \ - $(TOP)/external/PRIVATE/drm \ - $(TOP)/external/drm)) -ifeq ($(LIBDRM_PATH),) - $(error "Unable to find libdrm!") -endif - skip_lib_list := \ igt_kms.c \ igt_kms.h @@ -65,10 +50,7 @@ define add_test $(LOCAL_PATH)/config.h LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/lib \ - $(LIBDRM_PATH)/include/drm \ - $(LIBDRM_PATH)/intel \ - $(LIBPCIACCESS_PATH)/include + $(LOCAL_PATH)/lib LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM LOCAL_CFLAGS += -DANDROID -UNDEBUG -include "check-ndebug.h" diff --git a/tools/Android.mk b/tools/Android.mk index 99c39b7..7227c89 100644 --- a/tools/Android.mk +++ b/tools/Android.mk @@ -1,21 +1,6 @@ include $(LOCAL_PATH)/tools/Makefile.sources include $(LOCAL_PATH)/lib/Makefile.sources -LIBPCIACCESS_PATH := $(firstword $(wildcard \ - $(TOP)/external/PRIVATE/libpciaccess \ - $(TOP)/hardware/intel/libpciaccess \ - $(TOP)/external/libpciaccess)) -ifeq ($(LIBPCIACCESS_PATH),) - $(error "Unable to find libpciaccess!") -endif - -LIBDRM_PATH := $(firstword $(wildcard \ - $(TOP)/external/PRIVATE/drm \ - $(TOP)/external/drm)) -ifeq ($(LIBDRM_PATH),) - $(error "Unable to find libdrm!") -endif - skip_lib_list := \ igt_kms.c \ igt_kms.h @@ -33,10 +18,7 @@ define add_tool $(LIB_SOURCES) LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/lib \ - $(LIBDRM_PATH)/include/drm \ - $(LIBDRM_PATH)/intel \ - $(LIBPCIACCESS_PATH)/include + $(LOCAL_PATH)/lib LOCAL_CFLAGS += -DHAVE_TERMIOS_H LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM