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>
main
Emil Velikov 2015-03-17 23:30:08 +00:00
parent e2acca4e40
commit 24ac8cd7db
6 changed files with 7 additions and 9 deletions

View File

@ -33,7 +33,7 @@ LOCAL_MODULE := libdrm
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(LIBDRM_FILES) LOCAL_SRC_FILES := $(LIBDRM_FILES)
LOCAL_EXPORT_C_INCLUDE_DIRS += \ LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(LOCAL_PATH) \ $(LOCAL_PATH) \
$(LOCAL_PATH)/include/drm $(LOCAL_PATH)/include/drm

View File

@ -10,8 +10,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := libdrm LOCAL_SHARED_LIBRARIES := libdrm
LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES) LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES)
LOCAL_EXPORT_C_INCLUDE_DIRS += \ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
$(LOCAL_PATH)/freedreno
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(LIBDRM_TOP) \ $(LIBDRM_TOP) \

View File

@ -31,8 +31,7 @@ LOCAL_MODULE := libdrm_intel
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES) LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES)
LOCAL_EXPORT_C_INCLUDE_DIRS += \ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
$(LOCAL_PATH)/intel
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(LIBDRM_TOP) \ $(LIBDRM_TOP) \

View File

@ -45,6 +45,8 @@ endif
LOCAL_MODULE := libkms LOCAL_MODULE := libkms
LOCAL_SHARED_LIBRARIES := libdrm LOCAL_SHARED_LIBRARIES := libdrm
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm
LOCAL_COPY_HEADERS_TO := libdrm LOCAL_COPY_HEADERS_TO := libdrm

View File

@ -10,8 +10,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := libdrm LOCAL_SHARED_LIBRARIES := libdrm
LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES) LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES)
LOCAL_EXPORT_C_INCLUDE_DIRS += \ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
$(LOCAL_PATH)/nouveau
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(LIBDRM_TOP) \ $(LIBDRM_TOP) \

View File

@ -10,8 +10,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := libdrm LOCAL_SHARED_LIBRARIES := libdrm
LOCAL_SRC_FILES := $(LIBDRM_RADEON_FILES) LOCAL_SRC_FILES := $(LIBDRM_RADEON_FILES)
LOCAL_EXPORT_C_INCLUDE_DIRS += \ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
$(LOCAL_PATH)/radeon
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(LIBDRM_TOP) \ $(LIBDRM_TOP) \