summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-09-07 15:31:00 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-09-28 17:09:33 +0100
commit98ec08d836d21a516f7646a10e0e2ae4501182f1 (patch)
tree95e219f33aa846b89d87f17dbda5b87f1b9bb850 /Android.mk
parent666788a6062de62aa0b3560760fbb0903167a319 (diff)
automake: remove obsolete makefiles
Rather than having two extra makefiles in order to ship ~10 headers just fold its 5 lines of code into the top one makefile. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk8
1 files changed, 3 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index bb49b0b0..97a7d751 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,10 +26,8 @@ include $(CLEAR_VARS)
LIBDRM_TOP := $(LOCAL_PATH)
-# Import variables LIBDRM_FILES, LIBDRM_H_FILES
+# Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES
include $(LOCAL_PATH)/Makefile.sources
-# Import variables LIBDRM_INCLUDE_H_FILES, LIBDRM_INCLUDE_VMWGFX_H_FILES
-include $(LOCAL_PATH)/include/drm/Makefile.sources
LOCAL_MODULE := libdrm
LOCAL_MODULE_TAGS := optional
@@ -47,8 +45,8 @@ LOCAL_CFLAGS := \
LOCAL_COPY_HEADERS := \
$(LIBDRM_H_FILES) \
- $(addprefix include/drm/,$(LIBDRM_INCLUDE_H_FILES)) \
- $(addprefix include/drm/,$(LIBDRM_INCLUDE_VMWGFX_H_FILES))
+ $(LIBDRM_INCLUDE_H_FILES) \
+ $(LIBDRM_INCLUDE_VMWGFX_H_FILES)
LOCAL_COPY_HEADERS_TO := libdrm
include $(BUILD_SHARED_LIBRARY)