[Intel-gfx] [PATCH 2/5] android: Clean-up common makefile directives

[rafael.barbalho at intel.com]

From: Rafael Barbalho <rafael.barbalho at intel.com>

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 at intel.com>
---
 tests/Android.mk | 20 +-------------------
 tools/Android.mk | 20 +-------------------
 2 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/tests/Android.mk b/tests/Android.mk
index abccb7f..0e292a9 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -1,21 +1,6 @@
 include $(LOCAL_PATH)/tests/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
@@ -65,10 +50,7 @@ define add_test
        $(LOCAL_PATH)/config.h
 
     LOCAL_C_INCLUDES +=              \
-       $(LOCAL_PATH)/lib             \
-       $(LIBDRM_PATH)/include/drm    \
-       $(LIBDRM_PATH)/intel          \
-       $(LIBPCIACCESS_PATH)/include
+       $(LOCAL_PATH)/lib
 
     LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM
     LOCAL_CFLAGS += -DANDROID -UNDEBUG -include "check-ndebug.h"
diff --git a/tools/Android.mk b/tools/Android.mk
index 99c39b7..7227c89 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
-- 
1.8.5.2