diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-03-17 23:30:08 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-03-20 16:59:22 +0000 |
| commit | 24ac8cd7db201da1cd181b13173a420ff762e533 (patch) | |
| tree | e2e9a96cdbc40609f78fc623feb0f43b0f533e99 | |
| parent | e2acca4e40c87b00af75a5ffedafc26a099b657c (diff) | |
android: correcly set LOCAL_EXPORT_C_INCLUDE_DIRS
- 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 <emil.l.velikov@gmail.com>
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | freedreno/Android.mk | 3 | ||||
| -rw-r--r-- | intel/Android.mk | 3 | ||||
| -rw-r--r-- | libkms/Android.mk | 2 | ||||
| -rw-r--r-- | nouveau/Android.mk | 3 | ||||
| -rw-r--r-- | radeon/Android.mk | 3 |
6 files changed, 7 insertions, 9 deletions
@@ -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 22520fbf..31b90ef4 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 202c0d52..2a6bf605 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 d2df32a8..4d41fbca 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 93c9ec23..8e42c403 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 71c58bd7..b4065aab 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) \ |