From: tim.gore@intel.com Subject: [PATCH 2/3] intel-gpu-tools: fix some include path problems on android builds Date: Fri, 28 Mar 2014 12:54:59 +0000 Message-ID: <1396011300-11605-3-git-send-email-tim.gore@intel.com> References: <1396011300-11605-1-git-send-email-tim.gore@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: 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) In-Reply-To: <1396011300-11605-1-git-send-email-tim.gore@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org 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 -- 1.9.0