summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Paul <seanpaul@chromium.org>2015-06-04 12:08:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-04 12:08:01 +0000
commit90ddb1e256490f0a31739f8d0ec2ce069c477593 (patch)
tree16b87a03adf181357aa744e626d8022ee24c34b5
parentb4e810f97cc60cf93fbde28cf51c704b901f60ee (diff)
parent436a5fc69263d9f1c8ab8d52a0c8750f6a531b4c (diff)
downloaddrm_gralloc-90ddb1e256490f0a31739f8d0ec2ce069c477593.tar.gz
am 436a5fc6: drm_gralloc: Use external/libdrm for includes
* commit '436a5fc69263d9f1c8ab8d52a0c8750f6a531b4c': drm_gralloc: Use external/libdrm for includes
-rw-r--r--Android.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk
index f7ba142..24c9cb6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -86,8 +86,8 @@ LOCAL_SRC_FILES := \
gralloc_drm_kms.c
LOCAL_C_INCLUDES := \
- external/drm \
- external/drm/include/drm
+ external/libdrm \
+ external/libdrm/include/drm
LOCAL_SHARED_LIBRARIES := \
libdrm \
@@ -97,21 +97,21 @@ LOCAL_SHARED_LIBRARIES := \
ifneq ($(filter $(intel_drivers), $(DRM_GPU_DRIVERS)),)
LOCAL_SRC_FILES += gralloc_drm_intel.c
-LOCAL_C_INCLUDES += external/drm/intel
+LOCAL_C_INCLUDES += external/libdrm/intel
LOCAL_CFLAGS += -DENABLE_INTEL
LOCAL_SHARED_LIBRARIES += libdrm_intel
endif
ifneq ($(filter $(radeon_drivers), $(DRM_GPU_DRIVERS)),)
LOCAL_SRC_FILES += gralloc_drm_radeon.c
-LOCAL_C_INCLUDES += external/drm/radeon
+LOCAL_C_INCLUDES += external/libdrm/radeon
LOCAL_CFLAGS += -DENABLE_RADEON
LOCAL_SHARED_LIBRARIES += libdrm_radeon
endif
ifneq ($(filter $(nouveau_drivers), $(DRM_GPU_DRIVERS)),)
LOCAL_SRC_FILES += gralloc_drm_nouveau.c
-LOCAL_C_INCLUDES += external/drm/nouveau
+LOCAL_C_INCLUDES += external/libdrm/nouveau
LOCAL_CFLAGS += -DENABLE_NOUVEAU
LOCAL_SHARED_LIBRARIES += libdrm_nouveau
endif
@@ -154,8 +154,8 @@ LOCAL_SRC_FILES := \
gralloc.c \
LOCAL_C_INCLUDES := \
- external/drm \
- external/drm/include/drm \
+ external/libdrm \
+ external/libdrm/include/drm \
LOCAL_SHARED_LIBRARIES := \
libgralloc_drm \