From patchwork Fri Mar 28 12:54:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tim.gore@intel.com X-Patchwork-Id: 3903131 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 85C689F375 for ; Fri, 28 Mar 2014 12:56:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9ACA120303 for ; Fri, 28 Mar 2014 12:56:06 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 24C3520222 for ; Fri, 28 Mar 2014 12:56:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 642BA6ECC1; Fri, 28 Mar 2014 05:56:04 -0700 (PDT) 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 44F4E6ECC4 for ; Fri, 28 Mar 2014 05:56:01 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 28 Mar 2014 05:55:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,751,1389772800"; d="scan'208";a="509646177" Received: from tgore-linux.iwi.intel.com ([172.28.253.54]) by orsmga002.jf.intel.com with ESMTP; 28 Mar 2014 05:55:23 -0700 From: tim.gore@intel.com To: intel-gfx@lists.freedesktop.org Date: Fri, 28 Mar 2014 12:54:59 +0000 Message-Id: <1396011300-11605-3-git-send-email-tim.gore@intel.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1396011300-11605-1-git-send-email-tim.gore@intel.com> References: <1396011300-11605-1-git-send-email-tim.gore@intel.com> Subject: [Intel-gfx] [PATCH 2/3] intel-gpu-tools: fix some include path problems on android builds X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 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.6 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: tgore When building within the android tree (specifically in /external) the compilation fails due to the wrong versions of some header files getting picked up. This commit adds some include paths to ensure the correct headers are found Signed-off-by: Tim Gore --- tests/Android.mk | 3 +++ tools/Android.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/tests/Android.mk b/tests/Android.mk index 3069819..9233b2b 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -17,6 +17,9 @@ define add_test # Excessive complaining for established cases. Rely on the Linux version warnings. LOCAL_CFLAGS += -Wno-sign-compare + LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib + LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/PRIVATE/drm/include/drm + LOCAL_MODULE := $1 LOCAL_MODULE_TAGS := optional diff --git a/tools/Android.mk b/tools/Android.mk index a957ec1..8ca67f4 100644 --- a/tools/Android.mk +++ b/tools/Android.mk @@ -18,6 +18,9 @@ define add_tool # Excessive complaining for established cases. Rely on the Linux version warnings. LOCAL_CFLAGS += -Wno-sign-compare + LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib + LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/PRIVATE/drm/include/drm + LOCAL_MODULE := $1 LOCAL_MODULE_TAGS := optional