diff options
-rw-r--r-- | Android.mk | 9 | ||||
-rw-r--r-- | freedreno/Android.mk | 10 | ||||
-rw-r--r-- | intel/Android.mk | 8 | ||||
-rw-r--r-- | libkms/Android.mk | 2 | ||||
-rw-r--r-- | nouveau/Android.mk | 10 | ||||
-rw-r--r-- | radeon/Android.mk | 10 | ||||
-rw-r--r-- | rockchip/Android.mk | 8 | ||||
-rw-r--r-- | tegra/Android.mk | 12 | ||||
-rw-r--r-- | tests/modetest/Android.mk | 4 | ||||
-rw-r--r-- | tests/planetest/Android.mk | 8 |
10 files changed, 13 insertions, 68 deletions
@@ -22,7 +22,6 @@ | |||
22 | # | 22 | # |
23 | 23 | ||
24 | LOCAL_PATH := $(call my-dir) | 24 | LOCAL_PATH := $(call my-dir) |
25 | LIBDRM_TOP := $(LOCAL_PATH) | ||
26 | 25 | ||
27 | # Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES | 26 | # Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES |
28 | include $(LOCAL_PATH)/Makefile.sources | 27 | include $(LOCAL_PATH)/Makefile.sources |
@@ -31,8 +30,7 @@ common_CFLAGS := -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | |||
31 | 30 | ||
32 | # Static library for the device (recovery) | 31 | # Static library for the device (recovery) |
33 | include $(CLEAR_VARS) | 32 | include $(CLEAR_VARS) |
34 | LOCAL_MODULE_TAGS := optional | 33 | LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES)) |
35 | LOCAL_SRC_FILES := $(LIBDRM_FILES) | ||
36 | LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH) $(LOCAL_PATH)/include/drm | 34 | LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH) $(LOCAL_PATH)/include/drm |
37 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/drm | 35 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/drm |
38 | LOCAL_CFLAGS := $(common_CFLAGS) | 36 | LOCAL_CFLAGS := $(common_CFLAGS) |
@@ -41,8 +39,7 @@ include $(BUILD_STATIC_LIBRARY) | |||
41 | 39 | ||
42 | # Dynamic library for the device | 40 | # Dynamic library for the device |
43 | include $(CLEAR_VARS) | 41 | include $(CLEAR_VARS) |
44 | LOCAL_MODULE_TAGS := optional | 42 | LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES)) |
45 | LOCAL_SRC_FILES := $(LIBDRM_FILES) | ||
46 | LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH) $(LOCAL_PATH)/include/drm | 43 | LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH) $(LOCAL_PATH)/include/drm |
47 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/drm | 44 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/drm |
48 | LOCAL_CFLAGS := $(common_CFLAGS) | 45 | LOCAL_CFLAGS := $(common_CFLAGS) |
@@ -59,5 +56,5 @@ SUBDIRS := \ | |||
59 | tests/modetest \ | 56 | tests/modetest \ |
60 | tests/planetest | 57 | tests/planetest |
61 | 58 | ||
62 | mkfiles := $(patsubst %,$(LIBDRM_TOP)/%/Android.mk,$(SUBDIRS)) | 59 | mkfiles := $(patsubst %,$(LOCAL_PATH)/%/Android.mk,$(SUBDIRS)) |
63 | include $(mkfiles) | 60 | include $(mkfiles) |
diff --git a/freedreno/Android.mk b/freedreno/Android.mk index 5be5bc86..7abaeb73 100644 --- a/freedreno/Android.mk +++ b/freedreno/Android.mk | |||
@@ -5,18 +5,10 @@ include $(CLEAR_VARS) | |||
5 | include $(LOCAL_PATH)/Makefile.sources | 5 | include $(LOCAL_PATH)/Makefile.sources |
6 | 6 | ||
7 | LOCAL_MODULE := libdrm_freedreno | 7 | LOCAL_MODULE := libdrm_freedreno |
8 | LOCAL_MODULE_TAGS := optional | ||
9 | 8 | ||
10 | LOCAL_SHARED_LIBRARIES := libdrm | 9 | LOCAL_SHARED_LIBRARIES := libdrm |
11 | 10 | ||
12 | LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES) | 11 | LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FREEDRENO_FILES)) |
13 | LOCAL_EXPORT_C_INCLUDE_DIRS += \ | ||
14 | $(LOCAL_PATH)/freedreno | ||
15 | |||
16 | LOCAL_C_INCLUDES := \ | ||
17 | $(LIBDRM_TOP) \ | ||
18 | $(LIBDRM_TOP)/freedreno \ | ||
19 | $(LIBDRM_TOP)/include/drm | ||
20 | 12 | ||
21 | LOCAL_CFLAGS := \ | 13 | LOCAL_CFLAGS := \ |
22 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | 14 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 |
diff --git a/intel/Android.mk b/intel/Android.mk index 1a1fc6e9..bb474620 100644 --- a/intel/Android.mk +++ b/intel/Android.mk | |||
@@ -28,18 +28,12 @@ include $(CLEAR_VARS) | |||
28 | include $(LOCAL_PATH)/Makefile.sources | 28 | include $(LOCAL_PATH)/Makefile.sources |
29 | 29 | ||
30 | LOCAL_MODULE := libdrm_intel | 30 | LOCAL_MODULE := libdrm_intel |
31 | LOCAL_MODULE_TAGS := optional | ||
32 | 31 | ||
33 | LOCAL_SHARED_LIBRARIES := libdrm | 32 | LOCAL_SHARED_LIBRARIES := libdrm |
34 | 33 | ||
35 | LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES) | 34 | LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_INTEL_FILES)) |
36 | LOCAL_EXPORT_C_INCLUDE_DIRS += \ | ||
37 | $(LOCAL_PATH)/intel | ||
38 | 35 | ||
39 | LOCAL_C_INCLUDES := \ | 36 | LOCAL_C_INCLUDES := \ |
40 | $(LIBDRM_TOP) \ | ||
41 | $(LIBDRM_TOP)/intel \ | ||
42 | $(LIBDRM_TOP)/include/drm \ | ||
43 | external/libpciaccess/include | 37 | external/libpciaccess/include |
44 | 38 | ||
45 | LOCAL_CFLAGS := \ | 39 | LOCAL_CFLAGS := \ |
diff --git a/libkms/Android.mk b/libkms/Android.mk index bcadc2fd..34c10f56 100644 --- a/libkms/Android.mk +++ b/libkms/Android.mk | |||
@@ -46,6 +46,8 @@ ifneq ($(filter $(radeon_drivers), $(DRM_GPU_DRIVERS)),) | |||
46 | LOCAL_SRC_FILES += $(LIBKMS_RADEON_FILES) | 46 | LOCAL_SRC_FILES += $(LIBKMS_RADEON_FILES) |
47 | endif | 47 | endif |
48 | 48 | ||
49 | LOCAL_SRC_FILES := $(filter-out %.h,$(LOCAL_SRC_FILES)) | ||
50 | |||
49 | LOCAL_MODULE := libkms | 51 | LOCAL_MODULE := libkms |
50 | LOCAL_SHARED_LIBRARIES := libdrm | 52 | LOCAL_SHARED_LIBRARIES := libdrm |
51 | 53 | ||
diff --git a/nouveau/Android.mk b/nouveau/Android.mk index 7fb27ae4..712c004a 100644 --- a/nouveau/Android.mk +++ b/nouveau/Android.mk | |||
@@ -5,18 +5,10 @@ include $(CLEAR_VARS) | |||
5 | include $(LOCAL_PATH)/Makefile.sources | 5 | include $(LOCAL_PATH)/Makefile.sources |
6 | 6 | ||
7 | LOCAL_MODULE := libdrm_nouveau | 7 | LOCAL_MODULE := libdrm_nouveau |
8 | LOCAL_MODULE_TAGS := optional | ||
9 | 8 | ||
10 | LOCAL_SHARED_LIBRARIES := libdrm | 9 | LOCAL_SHARED_LIBRARIES := libdrm |
11 | 10 | ||
12 | LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES) | 11 | LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_NOUVEAU_FILES)) |
13 | LOCAL_EXPORT_C_INCLUDE_DIRS += \ | ||
14 | $(LOCAL_PATH)/nouveau | ||
15 | |||
16 | LOCAL_C_INCLUDES := \ | ||
17 | $(LIBDRM_TOP) \ | ||
18 | $(LIBDRM_TOP)/nouveau \ | ||
19 | $(LIBDRM_TOP)/include/drm | ||
20 | 12 | ||
21 | LOCAL_CFLAGS := \ | 13 | LOCAL_CFLAGS := \ |
22 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | 14 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 |
diff --git a/radeon/Android.mk b/radeon/Android.mk index 7eea6416..8783c871 100644 --- a/radeon/Android.mk +++ b/radeon/Android.mk | |||
@@ -5,18 +5,10 @@ include $(CLEAR_VARS) | |||
5 | include $(LOCAL_PATH)/Makefile.sources | 5 | include $(LOCAL_PATH)/Makefile.sources |
6 | 6 | ||
7 | LOCAL_MODULE := libdrm_radeon | 7 | LOCAL_MODULE := libdrm_radeon |
8 | LOCAL_MODULE_TAGS := optional | ||
9 | 8 | ||
10 | LOCAL_SHARED_LIBRARIES := libdrm | 9 | LOCAL_SHARED_LIBRARIES := libdrm |
11 | 10 | ||
12 | LOCAL_SRC_FILES := $(LIBDRM_RADEON_FILES) | 11 | LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_RADEON_FILES)) |
13 | LOCAL_EXPORT_C_INCLUDE_DIRS += \ | ||
14 | $(LOCAL_PATH)/radeon | ||
15 | |||
16 | LOCAL_C_INCLUDES := \ | ||
17 | $(LIBDRM_TOP) \ | ||
18 | $(LIBDRM_TOP)/radeon \ | ||
19 | $(LIBDRM_TOP)/include/drm | ||
20 | 12 | ||
21 | LOCAL_CFLAGS := \ | 13 | LOCAL_CFLAGS := \ |
22 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | 14 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 |
diff --git a/rockchip/Android.mk b/rockchip/Android.mk index 91c72d5d..05d421e2 100644 --- a/rockchip/Android.mk +++ b/rockchip/Android.mk | |||
@@ -2,18 +2,10 @@ LOCAL_PATH := $(call my-dir) | |||
2 | include $(CLEAR_VARS) | 2 | include $(CLEAR_VARS) |
3 | 3 | ||
4 | LOCAL_MODULE := libdrm_rockchip | 4 | LOCAL_MODULE := libdrm_rockchip |
5 | LOCAL_MODULE_TAGS := optional | ||
6 | 5 | ||
7 | LOCAL_SHARED_LIBRARIES := libdrm | 6 | LOCAL_SHARED_LIBRARIES := libdrm |
8 | 7 | ||
9 | LOCAL_SRC_FILES := rockchip_drm.c | 8 | LOCAL_SRC_FILES := rockchip_drm.c |
10 | LOCAL_EXPORT_C_INCLUDE_DIRS += \ | ||
11 | $(LOCAL_PATH)/rockchip | ||
12 | |||
13 | LOCAL_C_INCLUDES := \ | ||
14 | $(LIBDRM_TOP) \ | ||
15 | $(LIBDRM_TOP)/rockchip \ | ||
16 | $(LIBDRM_TOP)/include/drm | ||
17 | 9 | ||
18 | LOCAL_CFLAGS := \ | 10 | LOCAL_CFLAGS := \ |
19 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | 11 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 |
diff --git a/tegra/Android.mk b/tegra/Android.mk index 71476fad..d2a1a59d 100644 --- a/tegra/Android.mk +++ b/tegra/Android.mk | |||
@@ -2,20 +2,10 @@ LOCAL_PATH := $(call my-dir) | |||
2 | include $(CLEAR_VARS) | 2 | include $(CLEAR_VARS) |
3 | 3 | ||
4 | LOCAL_MODULE := libdrm_tegra | 4 | LOCAL_MODULE := libdrm_tegra |
5 | LOCAL_MODULE_TAGS := optional | ||
6 | 5 | ||
7 | LOCAL_SHARED_LIBRARIES := libdrm | 6 | LOCAL_SHARED_LIBRARIES := libdrm |
8 | 7 | ||
9 | LOCAL_SRC_FILES := \ | 8 | LOCAL_SRC_FILES := tegra.c |
10 | private.h \ | ||
11 | tegra.c | ||
12 | LOCAL_EXPORT_C_INCLUDE_DIRS += \ | ||
13 | $(LOCAL_PATH)/tegra | ||
14 | |||
15 | LOCAL_C_INCLUDES := \ | ||
16 | $(LIBDRM_TOP) \ | ||
17 | $(LIBDRM_TOP)/tegra \ | ||
18 | $(LIBDRM_TOP)/include/drm | ||
19 | 9 | ||
20 | LOCAL_CFLAGS := \ | 10 | LOCAL_CFLAGS := \ |
21 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | 11 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 |
diff --git a/tests/modetest/Android.mk b/tests/modetest/Android.mk index aee35649..6507b48b 100644 --- a/tests/modetest/Android.mk +++ b/tests/modetest/Android.mk | |||
@@ -3,12 +3,10 @@ LOCAL_PATH := $(call my-dir) | |||
3 | include $(CLEAR_VARS) | 3 | include $(CLEAR_VARS) |
4 | include $(LOCAL_PATH)/Makefile.sources | 4 | include $(LOCAL_PATH)/Makefile.sources |
5 | 5 | ||
6 | LOCAL_SRC_FILES := $(MODETEST_FILES) | 6 | LOCAL_SRC_FILES := $(filter-out %.h,$(MODETEST_FILES)) |
7 | 7 | ||
8 | LOCAL_MODULE := modetest | 8 | LOCAL_MODULE := modetest |
9 | 9 | ||
10 | LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm | ||
11 | |||
12 | LOCAL_SHARED_LIBRARIES := libdrm | 10 | LOCAL_SHARED_LIBRARIES := libdrm |
13 | 11 | ||
14 | include $(BUILD_EXECUTABLE) | 12 | include $(BUILD_EXECUTABLE) |
diff --git a/tests/planetest/Android.mk b/tests/planetest/Android.mk index 8f582386..3616e2b9 100644 --- a/tests/planetest/Android.mk +++ b/tests/planetest/Android.mk | |||
@@ -3,12 +3,10 @@ LOCAL_PATH := $(call my-dir) | |||
3 | include $(CLEAR_VARS) | 3 | include $(CLEAR_VARS) |
4 | include $(LOCAL_PATH)/Makefile.sources | 4 | include $(LOCAL_PATH)/Makefile.sources |
5 | 5 | ||
6 | LOCAL_SRC_FILES := $(PLANETEST_COMMON_FILES) $(PLANETEST_FILES) | 6 | LOCAL_SRC_FILES := $(filter-out %.h,$(PLANETEST_COMMON_FILES) $(PLANETEST_FILES)) |
7 | 7 | ||
8 | LOCAL_MODULE := planetest | 8 | LOCAL_MODULE := planetest |
9 | 9 | ||
10 | LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm | ||
11 | |||
12 | LOCAL_SHARED_LIBRARIES := libdrm | 10 | LOCAL_SHARED_LIBRARIES := libdrm |
13 | 11 | ||
14 | include $(BUILD_EXECUTABLE) | 12 | include $(BUILD_EXECUTABLE) |
@@ -16,12 +14,10 @@ include $(BUILD_EXECUTABLE) | |||
16 | include $(CLEAR_VARS) | 14 | include $(CLEAR_VARS) |
17 | include $(LOCAL_PATH)/Makefile.sources | 15 | include $(LOCAL_PATH)/Makefile.sources |
18 | 16 | ||
19 | LOCAL_SRC_FILES := $(PLANETEST_COMMON_FILES) $(ATOMICTEST_FILES) | 17 | LOCAL_SRC_FILES := $(filter-out %.h,$(PLANETEST_COMMON_FILES) $(ATOMICTEST_FILES)) |
20 | 18 | ||
21 | LOCAL_MODULE := atomictest | 19 | LOCAL_MODULE := atomictest |
22 | 20 | ||
23 | LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm | ||
24 | |||
25 | LOCAL_SHARED_LIBRARIES := libdrm | 21 | LOCAL_SHARED_LIBRARIES := libdrm |
26 | 22 | ||
27 | include $(BUILD_EXECUTABLE) | 23 | include $(BUILD_EXECUTABLE) |