diff options
| -rw-r--r-- | benchmarks/Android.mk | 3 | ||||
| -rw-r--r-- | demos/Android.mk | 3 | ||||
| -rw-r--r-- | lib/Android.mk | 4 | ||||
| -rw-r--r-- | lib/tests/Android.mk | 4 | ||||
| -rw-r--r-- | tests/Android.mk | 4 | ||||
| -rw-r--r-- | tools/Android.mk | 2 |
6 files changed, 11 insertions, 9 deletions
diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk index faa73b71..4ea275c4 100644 --- a/benchmarks/Android.mk +++ b/benchmarks/Android.mk @@ -10,7 +10,8 @@ define add_benchmark LOCAL_SRC_FILES := $1.c - LOCAL_C_INCLUDES = ${IGT_LOCAL_C_INCLUDES} + LOCAL_C_INCLUDES = ${IGT_LOCAL_C_INCLUDES} \ + $(LOCAL_PATH)/../lib/stubs/drm/ LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM LOCAL_CFLAGS += -DANDROID -UNDEBUG -include "check-ndebug.h" LOCAL_CFLAGS += -std=gnu99 diff --git a/demos/Android.mk b/demos/Android.mk index 90d8b37d..1f50fdcb 100644 --- a/demos/Android.mk +++ b/demos/Android.mk @@ -16,7 +16,8 @@ LOCAL_CFLAGS += -std=gnu99 # 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 = $(LOCAL_PATH)/../lib \ + $(LOCAL_PATH)/../lib/stubs/drm/ LOCAL_MODULE := intel_sprite_on diff --git a/lib/Android.mk b/lib/Android.mk index 003ade51..31f88be7 100644 --- a/lib/Android.mk +++ b/lib/Android.mk @@ -17,8 +17,8 @@ LOCAL_GENERATED_SOURCES := \ $(IGT_LIB_PATH)/version.h \ $(GPU_TOOLS_PATH)/config.h -LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/.. +LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ + $(LOCAL_PATH)/stubs/drm/ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) diff --git a/lib/tests/Android.mk b/lib/tests/Android.mk index 026f17f8..bbbd4d86 100644 --- a/lib/tests/Android.mk +++ b/lib/tests/Android.mk @@ -30,8 +30,8 @@ IGT_LOCAL_CFLAGS += -std=gnu99 IGT_LOCAL_CFLAGS += -Wno-error=return-type # set local includes -IGT_LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib -IGT_LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/PRIVATE/drm/include/drm +IGT_LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib \ + $(LOCAL_PATH)/../lib/stubs/drm/ # set local libraries IGT_LOCAL_STATIC_LIBRARIES := libintel_gpu_tools diff --git a/tests/Android.mk b/tests/Android.mk index b664dff2..c6e966fa 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -40,8 +40,8 @@ IGT_LOCAL_CFLAGS += -Wno-error=return-type IGT_LOCAL_CFLAGS += -Wno-sign-compare # set local includes -IGT_LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib -IGT_LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/PRIVATE/drm/include/drm +IGT_LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib \ + $(LOCAL_PATH)/../lib/stubs/drm/ # set local libraries IGT_LOCAL_STATIC_LIBRARIES := libintel_gpu_tools diff --git a/tools/Android.mk b/tools/Android.mk index 0bad29c5..56535720 100644 --- a/tools/Android.mk +++ b/tools/Android.mk @@ -30,7 +30,7 @@ define add_tool endif LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib - LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/PRIVATE/drm/include/drm + LOCAL_C_INCLUDES += $(LOCAL_PATH)/../lib/stubs/drm/ LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/zlib LOCAL_MODULE := $1_tool |