OSDN Git Service

android: do not use copied headers
authorChih-Wei Huang <cwhuang@linux.org.tw>
Mon, 27 Apr 2015 16:50:38 +0000 (00:50 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 16 Jul 2015 13:48:42 +0000 (21:48 +0800)
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>
src/gallium/targets/egl-static/Android.mk

index adaf582..b075d58 100644 (file)
@@ -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