[libdrm,1/5] android: correcly set LOCAL_EXPORT_C_INCLUDE_DIRS

Commit Message

Emil Velikov March 17, 2015, 11:30 p.m. UTC

- Don't add ${hw}/${hw}, but ${hw} to the includes path. The former
does not exist.
 - Set the variable for libkms.

Inspired by the work of from Chih-Wei from the Android-x86 project.

Signed-off-by: Emil Velikov <[e-mail]>
---
 Android.mk           | 2 +-
 freedreno/Android.mk | 3 +--
 intel/Android.mk     | 3 +--
 libkms/Android.mk    | 2 ++
 nouveau/Android.mk   | 3 +--
 radeon/Android.mk    | 3 +--
 6 files changed, 7 insertions(+), 9 deletions(-)

Patch

diff --git a/Android.mk b/Android.mk
index 6f76113..e6d85d4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,7 +33,7 @@  LOCAL_MODULE := libdrm
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(LIBDRM_FILES)
-LOCAL_EXPORT_C_INCLUDE_DIRS += \
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
 	$(LOCAL_PATH) \
 	$(LOCAL_PATH)/include/drm
 
diff --git a/freedreno/Android.mk b/freedreno/Android.mk
index 22520fb..31b90ef 100644
--- a/freedreno/Android.mk
+++ b/freedreno/Android.mk
@@ -10,8 +10,7 @@  LOCAL_MODULE_TAGS := optional
 LOCAL_SHARED_LIBRARIES := libdrm
 
 LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES)
-LOCAL_EXPORT_C_INCLUDE_DIRS += \
-	$(LOCAL_PATH)/freedreno
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
 LOCAL_C_INCLUDES := \
 	$(LIBDRM_TOP) \
diff --git a/intel/Android.mk b/intel/Android.mk
index 202c0d5..2a6bf60 100644
--- a/intel/Android.mk
+++ b/intel/Android.mk
@@ -31,8 +31,7 @@  LOCAL_MODULE := libdrm_intel
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES)
-LOCAL_EXPORT_C_INCLUDE_DIRS += \
-	$(LOCAL_PATH)/intel
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
 LOCAL_C_INCLUDES := \
 	$(LIBDRM_TOP) \
diff --git a/libkms/Android.mk b/libkms/Android.mk
index d2df32a..4d41fbc 100644
--- a/libkms/Android.mk
+++ b/libkms/Android.mk
@@ -45,6 +45,8 @@  endif
 LOCAL_MODULE := libkms
 LOCAL_SHARED_LIBRARIES := libdrm
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+
 LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm
 
 LOCAL_COPY_HEADERS_TO := libdrm
diff --git a/nouveau/Android.mk b/nouveau/Android.mk
index 93c9ec2..8e42c40 100644
--- a/nouveau/Android.mk
+++ b/nouveau/Android.mk
@@ -10,8 +10,7 @@  LOCAL_MODULE_TAGS := optional
 LOCAL_SHARED_LIBRARIES := libdrm
 
 LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES)
-LOCAL_EXPORT_C_INCLUDE_DIRS += \
-	$(LOCAL_PATH)/nouveau
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
 LOCAL_C_INCLUDES := \
 	$(LIBDRM_TOP) \
diff --git a/radeon/Android.mk b/radeon/Android.mk
index 71c58bd..b4065aa 100644
--- a/radeon/Android.mk
+++ b/radeon/Android.mk
@@ -10,8 +10,7 @@  LOCAL_MODULE_TAGS := optional
 LOCAL_SHARED_LIBRARIES := libdrm
 
 LOCAL_SRC_FILES := $(LIBDRM_RADEON_FILES)
-LOCAL_EXPORT_C_INCLUDE_DIRS += \
-	$(LOCAL_PATH)/radeon
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
 LOCAL_C_INCLUDES := \
 	$(LIBDRM_TOP) \