[Mesa-dev] [PATCH 08/12] android: fix libelf include path for Android 7.0

[Mauro Rossi]

LOCAL_C_INCLUDES need to include correct path of libelf,
which had exceptions for Android 5.0 (i.e external/elfutils/0.153/libelf)
and Android 6.0 (i.e. external/elfutils/src/libelf)
In Android 7.0 the path is again external/elfutils/libelf

Fixes the following building error:

external/mesa/src/gallium/drivers/radeon/radeon_elf_util.c:32:10:
fatal error: 'gelf.h' file not found
#include <gelf.h>
         ^
1 error generated.
---
 src/gallium/Android.common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/Android.common.mk b/src/gallium/Android.common.mk
index 757716f..b40b8c6 100644
--- a/src/gallium/Android.common.mk
+++ b/src/gallium/Android.common.mk
@@ -34,7 +34,7 @@ LOCAL_C_INCLUDES += \
 	external/llvm/include \
 	external/llvm/device/include \
 	external/libcxx/include \
-	external/elfutils/$(if $(filter 5,$(MESA_ANDROID_MAJOR_VERSION)),0.153/,src/)libelf
+	external/elfutils/$(if $(filter 5,$(MESA_ANDROID_MAJOR_VERSION)),0.153/,$(if $(filter 6,$(MESA_ANDROID_MAJOR_VERSION)),src/))libelf
 endif
 
 include $(MESA_COMMON_MK)
-- 
2.9.3