Commit 6047b01f authored by Arkadiusz Hiler's avatar Arkadiusz Hiler

Android.mk: Use drm stubs

Use drm stubs that sit under lib/stubs.

Also drop strange, nonexistent additions to LOCAL_C_INCLUDES.
Signed-off-by: Arkadiusz Hiler's avatarArkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Petri Latvala's avatarPetri Latvala <petri.latvala@intel.com>
parent 60c5bb53
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment