intel-gpu-tools: fix some include path problems on android builds

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 <tim.gore@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/tests/Android.mk b/tests/Android.mk
index 3069819..9233b2b 100644 (file)
--- 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 (file)
--- 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