aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross2015-12-21 17:48:23 -0600
committerColin Cross2015-12-21 17:48:23 -0600
commitb069597d8223923cf0c350eb199287c1f880035e (patch)
treeb7b3f6d4e94709565b94845208e70843dcb7496d
parent93b1c6466800f6b1b1621b12256913d615175d26 (diff)
downloadexternal-libdrm-b069597d8223923cf0c350eb199287c1f880035e.tar.gz
external-libdrm-b069597d8223923cf0c350eb199287c1f880035e.tar.xz
external-libdrm-b069597d8223923cf0c350eb199287c1f880035e.zip
Remove LOCAL_COPY_HEADERS
Copying headers is bad for enforcing build dependencies because it puts the headers in a location that anyone can include them without depending on the module. The new build system will not support copying headers. Remove LOCAL_COPY_HEADERS, they are already available through LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) Change-Id: I545228718b7a3ad108f155673df8e7faf1c6dd3e
-rw-r--r--Android.mk6
-rw-r--r--freedreno/Android.mk3
-rw-r--r--intel/Android.mk3
-rw-r--r--libkms/Android.mk5
-rw-r--r--nouveau/Android.mk3
-rw-r--r--radeon/Android.mk3
-rw-r--r--rockchip/Android.mk3
-rw-r--r--tegra/Android.mk3
8 files changed, 0 insertions, 29 deletions
diff --git a/Android.mk b/Android.mk
index 966514dd..38b67d03 100644
--- a/Android.mk
+++ b/Android.mk
@@ -47,12 +47,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH) $(LOCAL_PATH)/include/drm
47LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/drm 47LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/drm
48LOCAL_CFLAGS := $(common_CFLAGS) 48LOCAL_CFLAGS := $(common_CFLAGS)
49 49
50LOCAL_COPY_HEADERS := \
51 $(LIBDRM_H_FILES) \
52 $(LIBDRM_INCLUDE_H_FILES) \
53 $(LIBDRM_INCLUDE_VMWGFX_H_FILES)
54LOCAL_COPY_HEADERS_TO := libdrm
55
56LOCAL_MODULE := libdrm 50LOCAL_MODULE := libdrm
57include $(BUILD_SHARED_LIBRARY) 51include $(BUILD_SHARED_LIBRARY)
58 52
diff --git a/freedreno/Android.mk b/freedreno/Android.mk
index 243a1e23..5be5bc86 100644
--- a/freedreno/Android.mk
+++ b/freedreno/Android.mk
@@ -21,9 +21,6 @@ LOCAL_C_INCLUDES := \
21LOCAL_CFLAGS := \ 21LOCAL_CFLAGS := \
22 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 22 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
23 23
24LOCAL_COPY_HEADERS := $(LIBDRM_FREEDRENO_H_FILES)
25LOCAL_COPY_HEADERS_TO := freedreno
26
27LOCAL_SHARED_LIBRARIES := \ 24LOCAL_SHARED_LIBRARIES := \
28 libdrm 25 libdrm
29 26
diff --git a/intel/Android.mk b/intel/Android.mk
index f2f21b90..1a1fc6e9 100644
--- a/intel/Android.mk
+++ b/intel/Android.mk
@@ -45,9 +45,6 @@ LOCAL_C_INCLUDES := \
45LOCAL_CFLAGS := \ 45LOCAL_CFLAGS := \
46 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 46 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
47 47
48LOCAL_COPY_HEADERS := $(LIBDRM_INTEL_H_FILES)
49LOCAL_COPY_HEADERS_TO := libdrm
50
51LOCAL_SHARED_LIBRARIES := \ 48LOCAL_SHARED_LIBRARIES := \
52 libdrm \ 49 libdrm \
53 libpciaccess 50 libpciaccess
diff --git a/libkms/Android.mk b/libkms/Android.mk
index 2f3d411a..bcadc2fd 100644
--- a/libkms/Android.mk
+++ b/libkms/Android.mk
@@ -49,9 +49,4 @@ endif
49LOCAL_MODULE := libkms 49LOCAL_MODULE := libkms
50LOCAL_SHARED_LIBRARIES := libdrm 50LOCAL_SHARED_LIBRARIES := libdrm
51 51
52LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm
53
54LOCAL_COPY_HEADERS_TO := libdrm
55LOCAL_COPY_HEADERS := $(LIBKMS_H_FILES)
56
57include $(BUILD_SHARED_LIBRARY) 52include $(BUILD_SHARED_LIBRARY)
diff --git a/nouveau/Android.mk b/nouveau/Android.mk
index 734fc219..7fb27ae4 100644
--- a/nouveau/Android.mk
+++ b/nouveau/Android.mk
@@ -21,9 +21,6 @@ LOCAL_C_INCLUDES := \
21LOCAL_CFLAGS := \ 21LOCAL_CFLAGS := \
22 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 22 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
23 23
24LOCAL_COPY_HEADERS := $(LIBDRM_NOUVEAU_H_FILES)
25LOCAL_COPY_HEADERS_TO := libdrm
26
27LOCAL_SHARED_LIBRARIES := \ 24LOCAL_SHARED_LIBRARIES := \
28 libdrm 25 libdrm
29 26
diff --git a/radeon/Android.mk b/radeon/Android.mk
index 9cba546c..7eea6416 100644
--- a/radeon/Android.mk
+++ b/radeon/Android.mk
@@ -21,9 +21,6 @@ LOCAL_C_INCLUDES := \
21LOCAL_CFLAGS := \ 21LOCAL_CFLAGS := \
22 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 22 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
23 23
24LOCAL_COPY_HEADERS := $(LIBDRM_RADEON_H_FILES)
25LOCAL_COPY_HEADERS_TO := libdrm
26
27LOCAL_SHARED_LIBRARIES := \ 24LOCAL_SHARED_LIBRARIES := \
28 libdrm 25 libdrm
29 26
diff --git a/rockchip/Android.mk b/rockchip/Android.mk
index 4569044e..91c72d5d 100644
--- a/rockchip/Android.mk
+++ b/rockchip/Android.mk
@@ -18,9 +18,6 @@ LOCAL_C_INCLUDES := \
18LOCAL_CFLAGS := \ 18LOCAL_CFLAGS := \
19 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 19 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
20 20
21LOCAL_COPY_HEADERS := rockchip_drm.h rockchip_drmif.h
22LOCAL_COPY_HEADERS_TO := libdrm
23
24LOCAL_SHARED_LIBRARIES := \ 21LOCAL_SHARED_LIBRARIES := \
25 libdrm 22 libdrm
26 23
diff --git a/tegra/Android.mk b/tegra/Android.mk
index b0a043f2..71476fad 100644
--- a/tegra/Android.mk
+++ b/tegra/Android.mk
@@ -20,9 +20,6 @@ LOCAL_C_INCLUDES := \
20LOCAL_CFLAGS := \ 20LOCAL_CFLAGS := \
21 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 21 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
22 22
23LOCAL_COPY_HEADERS := tegra.h
24LOCAL_COPY_HEADERS_TO := libdrm
25
26LOCAL_SHARED_LIBRARIES := \ 23LOCAL_SHARED_LIBRARIES := \
27 libdrm 24 libdrm
28 25