flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-07-25 18:57:41 +00:00
Code Issues Releases Wiki Activity

android: Clean-up common makefile directives

Browse Source 
All the Android.mk files had the same directives to find the path of
libdrm & libpciaccess. These are no longer required as the android system
now allows the libraries being used to export include paths to dependant
modules & programs.

Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
This commit is contained in:
Rafael Barbalho 2014-01-31 14:57:37 +00:00 committed by Damien Lespiau
parent 79ea9a9071
commit 4c79264b3c
2 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/Android.mk
View File

@ -1,21 +1,6 @@
include $(LOCAL_PATH)/tests/Makefile.sources include $(LOCAL_PATH)/tests/Makefile.sources
include $(LOCAL_PATH)/lib/Makefile.sources include $(LOCAL_PATH)/lib/Makefile.sources
LIBPCIACCESS_PATH := $(firstword $(wildcard \
$(TOP)/external/PRIVATE/libpciaccess \
$(TOP)/hardware/intel/libpciaccess \
$(TOP)/external/libpciaccess))
ifeq ($(LIBPCIACCESS_PATH),)
$(error "Unable to find libpciaccess!")
endif
LIBDRM_PATH := $(firstword $(wildcard \
$(TOP)/external/PRIVATE/drm \
$(TOP)/external/drm))
ifeq ($(LIBDRM_PATH),)
$(error "Unable to find libdrm!")
endif
skip_lib_list := \ skip_lib_list := \
igt_kms.c \ igt_kms.c \
igt_kms.h igt_kms.h
@ -65,10 +50,7 @@ define add_test
$(LOCAL_PATH)/config.h $(LOCAL_PATH)/config.h
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/lib \ $(LOCAL_PATH)/lib
$(LIBDRM_PATH)/include/drm \
$(LIBDRM_PATH)/intel \
$(LIBPCIACCESS_PATH)/include
LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM
LOCAL_CFLAGS += -DANDROID -UNDEBUG -include "check-ndebug.h" LOCAL_CFLAGS += -DANDROID -UNDEBUG -include "check-ndebug.h"

20
tools/Android.mk
View File

@ -1,21 +1,6 @@
include $(LOCAL_PATH)/tools/Makefile.sources include $(LOCAL_PATH)/tools/Makefile.sources
include $(LOCAL_PATH)/lib/Makefile.sources include $(LOCAL_PATH)/lib/Makefile.sources
LIBPCIACCESS_PATH := $(firstword $(wildcard \
$(TOP)/external/PRIVATE/libpciaccess \
$(TOP)/hardware/intel/libpciaccess \
$(TOP)/external/libpciaccess))
ifeq ($(LIBPCIACCESS_PATH),)
$(error "Unable to find libpciaccess!")
endif
LIBDRM_PATH := $(firstword $(wildcard \
$(TOP)/external/PRIVATE/drm \
$(TOP)/external/drm))
ifeq ($(LIBDRM_PATH),)
$(error "Unable to find libdrm!")
endif
skip_lib_list := \ skip_lib_list := \
igt_kms.c \ igt_kms.c \
igt_kms.h igt_kms.h
@ -33,10 +18,7 @@ define add_tool
$(LIB_SOURCES) $(LIB_SOURCES)
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/lib \ $(LOCAL_PATH)/lib
$(LIBDRM_PATH)/include/drm \
$(LIBDRM_PATH)/intel \
$(LIBPCIACCESS_PATH)/include
LOCAL_CFLAGS += -DHAVE_TERMIOS_H LOCAL_CFLAGS += -DHAVE_TERMIOS_H
LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM