android: simplify LOCAL_C_INCLUDES

Each of the libdrm_${hw} modules pull libdrm for linking as such:

libdrm's LOCAL_EXPORT_C_INCLUDE_DIRS are added to the includes list.
The former of which is already set to ${top} and ${top}/include/drm.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/freedreno/Android.mk b/freedreno/Android.mk
index 31b90ef..d6c19fe 100644 (file)
--- a/freedreno/Android.mk
+++ b/freedreno/Android.mk
@@ -13,9 +13,7 @@ LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
 LOCAL_C_INCLUDES := \
-       $(LIBDRM_TOP) \
-       $(LIBDRM_TOP)/freedreno \
-       $(LIBDRM_TOP)/include/drm
+       $(LIBDRM_TOP)/freedreno
 
 LOCAL_CFLAGS := \
        -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1

diff --git a/intel/Android.mk b/intel/Android.mk
index 2a6bf60..8a30fb5 100644 (file)
--- a/intel/Android.mk
+++ b/intel/Android.mk
@@ -34,9 +34,7 @@ LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
 LOCAL_C_INCLUDES := \
-       $(LIBDRM_TOP) \
        $(LIBDRM_TOP)/intel \
-       $(LIBDRM_TOP)/include/drm \
        external/libpciaccess/include
 
 LOCAL_CFLAGS := \

diff --git a/libkms/Android.mk b/libkms/Android.mk
index 4d41fbc..3c400de 100644 (file)
--- a/libkms/Android.mk
+++ b/libkms/Android.mk
@@ -47,8 +47,6 @@ LOCAL_SHARED_LIBRARIES := libdrm
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
-LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm
-
 LOCAL_COPY_HEADERS_TO := libdrm
 LOCAL_COPY_HEADERS := $(LIBKMS_H_FILES)
 

diff --git a/nouveau/Android.mk b/nouveau/Android.mk
index 8e42c40..6c46f6c 100644 (file)
--- a/nouveau/Android.mk
+++ b/nouveau/Android.mk
@@ -13,9 +13,7 @@ LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
 LOCAL_C_INCLUDES := \
-       $(LIBDRM_TOP) \
-       $(LIBDRM_TOP)/nouveau \
-       $(LIBDRM_TOP)/include/drm
+       $(LIBDRM_TOP)/nouveau
 
 LOCAL_CFLAGS := \
        -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1

diff --git a/radeon/Android.mk b/radeon/Android.mk
index b4065aa..d9192b6 100644 (file)
--- a/radeon/Android.mk
+++ b/radeon/Android.mk
@@ -13,9 +13,7 @@ LOCAL_SRC_FILES := $(LIBDRM_RADEON_FILES)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
 LOCAL_C_INCLUDES := \
-       $(LIBDRM_TOP) \
-       $(LIBDRM_TOP)/radeon \
-       $(LIBDRM_TOP)/include/drm
+       $(LIBDRM_TOP)/radeon
 
 LOCAL_CFLAGS := \
        -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1