[Intel-gfx] [PATCH] Fix LIBDRM_PATH for top android build

[joao.santos at intel.com]

From: Joao Santos <joao.santos at intel.com>

Changed TOP to ANDROID_BUILD_TOP to allow package to be compiled as part
of a top build; LIBDRM_PATH changed to PATH_LIBDRM because otherwise it
cannot be written to when in a top build (must be getting used in some
other makefile).

Issue: VIZ-3495
Signed-off-by: Joao Santos <joao.santos at intel.com>

diff --git a/tests/Android.mk b/tests/Android.mk
index abccb7f..82b28cd 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -2,17 +2,17 @@ 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))
+   $(ANDROID_BUILD_TOP)/external/PRIVATE/libpciaccess      \
+   $(ANDROID_BUILD_TOP)/hardware/intel/libpciaccess        \
+   $(ANDROID_BUILD_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),)
+PATH_LIBDRM = $(firstword $(wildcard  \
+   $(ANDROID_BUILD_TOP)/external/PRIVATE/drm         \
+   $(ANDROID_BUILD_TOP)/external/drm))
+ifeq ($(PATH_LIBDRM),)
    $(error "Unable to find libdrm!")
 endif
 
@@ -66,8 +66,8 @@ define add_test
 
     LOCAL_C_INCLUDES +=              \
        $(LOCAL_PATH)/lib             \
-       $(LIBDRM_PATH)/include/drm    \
-       $(LIBDRM_PATH)/intel          \
+       $(PATH_LIBDRM)/include/drm    \
+       $(PATH_LIBDRM)/intel          \
        $(LIBPCIACCESS_PATH)/include
 
     LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM
-- 
1.7.9.5