diff options
author | Emil Velikov | 2015-03-17 18:30:08 -0500 |
---|---|---|
committer | Emil Velikov | 2015-03-20 11:59:22 -0500 |
commit | 24ac8cd7db201da1cd181b13173a420ff762e533 (patch) | |
tree | e2e9a96cdbc40609f78fc623feb0f43b0f533e99 | |
parent | e2acca4e40c87b00af75a5ffedafc26a099b657c (diff) | |
download | external-libdrm-24ac8cd7db201da1cd181b13173a420ff762e533.tar.gz external-libdrm-24ac8cd7db201da1cd181b13173a420ff762e533.tar.xz external-libdrm-24ac8cd7db201da1cd181b13173a420ff762e533.zip |
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 | |||
33 | LOCAL_MODULE_TAGS := optional | 33 | LOCAL_MODULE_TAGS := optional |
34 | 34 | ||
35 | LOCAL_SRC_FILES := $(LIBDRM_FILES) | 35 | LOCAL_SRC_FILES := $(LIBDRM_FILES) |
36 | LOCAL_EXPORT_C_INCLUDE_DIRS += \ | 36 | LOCAL_EXPORT_C_INCLUDE_DIRS := \ |
37 | $(LOCAL_PATH) \ | 37 | $(LOCAL_PATH) \ |
38 | $(LOCAL_PATH)/include/drm | 38 | $(LOCAL_PATH)/include/drm |
39 | 39 | ||
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 | |||
10 | LOCAL_SHARED_LIBRARIES := libdrm | 10 | LOCAL_SHARED_LIBRARIES := libdrm |
11 | 11 | ||
12 | LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES) | 12 | LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES) |
13 | LOCAL_EXPORT_C_INCLUDE_DIRS += \ | 13 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) |
14 | $(LOCAL_PATH)/freedreno | ||
15 | 14 | ||
16 | LOCAL_C_INCLUDES := \ | 15 | LOCAL_C_INCLUDES := \ |
17 | $(LIBDRM_TOP) \ | 16 | $(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 | |||
31 | LOCAL_MODULE_TAGS := optional | 31 | LOCAL_MODULE_TAGS := optional |
32 | 32 | ||
33 | LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES) | 33 | LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES) |
34 | LOCAL_EXPORT_C_INCLUDE_DIRS += \ | 34 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) |
35 | $(LOCAL_PATH)/intel | ||
36 | 35 | ||
37 | LOCAL_C_INCLUDES := \ | 36 | LOCAL_C_INCLUDES := \ |
38 | $(LIBDRM_TOP) \ | 37 | $(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 | |||
45 | LOCAL_MODULE := libkms | 45 | LOCAL_MODULE := libkms |
46 | LOCAL_SHARED_LIBRARIES := libdrm | 46 | LOCAL_SHARED_LIBRARIES := libdrm |
47 | 47 | ||
48 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) | ||
49 | |||
48 | LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm | 50 | LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm |
49 | 51 | ||
50 | LOCAL_COPY_HEADERS_TO := libdrm | 52 | 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 | |||
10 | LOCAL_SHARED_LIBRARIES := libdrm | 10 | LOCAL_SHARED_LIBRARIES := libdrm |
11 | 11 | ||
12 | LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES) | 12 | LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES) |
13 | LOCAL_EXPORT_C_INCLUDE_DIRS += \ | 13 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) |
14 | $(LOCAL_PATH)/nouveau | ||
15 | 14 | ||
16 | LOCAL_C_INCLUDES := \ | 15 | LOCAL_C_INCLUDES := \ |
17 | $(LIBDRM_TOP) \ | 16 | $(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 | |||
10 | LOCAL_SHARED_LIBRARIES := libdrm | 10 | LOCAL_SHARED_LIBRARIES := libdrm |
11 | 11 | ||
12 | LOCAL_SRC_FILES := $(LIBDRM_RADEON_FILES) | 12 | LOCAL_SRC_FILES := $(LIBDRM_RADEON_FILES) |
13 | LOCAL_EXPORT_C_INCLUDE_DIRS += \ | 13 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) |
14 | $(LOCAL_PATH)/radeon | ||
15 | 14 | ||
16 | LOCAL_C_INCLUDES := \ | 15 | LOCAL_C_INCLUDES := \ |
17 | $(LIBDRM_TOP) \ | 16 | $(LIBDRM_TOP) \ |