diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-03-17 23:30:09 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-03-20 16:59:22 +0000 |
| commit | af4379f759d4dc70331478277d788e59fd6a4145 (patch) | |
| tree | 7b8bc97fe5705e51e32e47ca05bf169ba3f6b99c | |
| parent | 24ac8cd7db201da1cd181b13173a420ff762e533 (diff) | |
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>
| -rw-r--r-- | freedreno/Android.mk | 4 | ||||
| -rw-r--r-- | intel/Android.mk | 2 | ||||
| -rw-r--r-- | libkms/Android.mk | 2 | ||||
| -rw-r--r-- | nouveau/Android.mk | 4 | ||||
| -rw-r--r-- | radeon/Android.mk | 4 |
5 files changed, 3 insertions, 13 deletions
diff --git a/freedreno/Android.mk b/freedreno/Android.mk index 31b90ef4..d6c19fe2 100644 --- 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 2a6bf605..8a30fb50 100644 --- 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 4d41fbca..3c400de5 100644 --- 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 8e42c403..6c46f6ca 100644 --- 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 b4065aab..d9192b65 100644 --- 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 |