From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Mon, 27 Apr 2015 16:50:38 +0000 (+0800)
Subject: android: do not use copied headers
X-Git-Tag: android-x86-4.4-r3~3
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-mesa.git;a=commitdiff_plain;h=9b094a1ab6de9bd9d8001ddf7964c4a104af7cce

android: do not use copied headers

LOCAL_COPY_HEADERS is deprecated and removed in libdrm.

Use LOCAL_SHARED_LIBRARIES to get the exported include paths
of libdrm_*.

Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
---

diff --git a/src/gallium/targets/egl-static/Android.mk b/src/gallium/targets/egl-static/Android.mk
index adaf582e15e..b075d58941e 100644
--- a/src/gallium/targets/egl-static/Android.mk
+++ b/src/gallium/targets/egl-static/Android.mk
@@ -47,11 +47,15 @@ LOCAL_CFLAGS += -DGALLIUM_SOFTPIPE
 
 # !swrast only
 ifneq ($(MESA_GPU_DRIVERS),swrast)
-LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm
+LOCAL_SHARED_LIBRARIES += libdrm
 endif
 
+ifneq ($(filter r%, $(MESA_GPU_DRIVERS)),)
+LOCAL_SHARED_LIBRARIES += libdrm_radeon
+endif
 ifneq ($(filter freedreno, $(MESA_GPU_DRIVERS)),)
 LOCAL_CFLAGS += -DGALLIUM_FREEDRENO
+LOCAL_SHARED_LIBRARIES += libdrm_freedreno
 endif
 ifneq ($(filter i915g, $(MESA_GPU_DRIVERS)),)
 LOCAL_CFLAGS += -DGALLIUM_I915