summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRafael Barbalho <rafael.barbalho@intel.com>2014-01-31 14:57:37 +0000
committerDamien Lespiau <damien.lespiau@intel.com>2014-02-04 10:52:06 +0000
commit4c79264b3cda6ef548f4125ebf49d470ab968ede (patch)
treee970e846daee16aafccda58c210f4acd50b61ce4 /tools
parent79ea9a9071fcd39493f68ae4d7ba9941701195c9 (diff)
android: Clean-up common makefile directives
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>
Diffstat (limited to 'tools')
-rw-r--r--tools/Android.mk20
1 files changed, 1 insertions, 19 deletions
diff --git a/tools/Android.mk b/tools/Android.mk
index 99c39b7c..7227c896 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -1,21 +1,6 @@
include $(LOCAL_PATH)/tools/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 := \
igt_kms.c \
igt_kms.h
@@ -33,10 +18,7 @@ define add_tool
$(LIB_SOURCES)
LOCAL_C_INCLUDES += \
- $(LOCAL_PATH)/lib \
- $(LIBDRM_PATH)/include/drm \
- $(LIBDRM_PATH)/intel \
- $(LIBPCIACCESS_PATH)/include
+ $(LOCAL_PATH)/lib
LOCAL_CFLAGS += -DHAVE_TERMIOS_H
LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM