diff options
author | Colin Cross | 2016-01-25 14:42:48 -0600 |
---|---|---|
committer | android-build-merger | 2016-01-25 14:42:48 -0600 |
commit | d760fcadf055f449f3c0a27dfdba021ab63d2b2f (patch) | |
tree | fe934584d76a0a3d6d78acccc089c55991514f7a | |
parent | bc4311881e7e6e88b8b8befd81a280f3d08d63f6 (diff) | |
parent | b069597d8223923cf0c350eb199287c1f880035e (diff) | |
download | external-libdrm-d760fcadf055f449f3c0a27dfdba021ab63d2b2f.tar.gz external-libdrm-d760fcadf055f449f3c0a27dfdba021ab63d2b2f.tar.xz external-libdrm-d760fcadf055f449f3c0a27dfdba021ab63d2b2f.zip |
Remove LOCAL_COPY_HEADERS
am: b069597d82
* commit 'b069597d8223923cf0c350eb199287c1f880035e':
Remove LOCAL_COPY_HEADERS
-rw-r--r-- | Android.mk | 6 | ||||
-rw-r--r-- | freedreno/Android.mk | 3 | ||||
-rw-r--r-- | intel/Android.mk | 3 | ||||
-rw-r--r-- | libkms/Android.mk | 5 | ||||
-rw-r--r-- | nouveau/Android.mk | 3 | ||||
-rw-r--r-- | radeon/Android.mk | 3 | ||||
-rw-r--r-- | rockchip/Android.mk | 3 | ||||
-rw-r--r-- | tegra/Android.mk | 3 |
8 files changed, 0 insertions, 29 deletions
@@ -47,12 +47,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH) $(LOCAL_PATH)/include/drm | |||
47 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/drm | 47 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/drm |
48 | LOCAL_CFLAGS := $(common_CFLAGS) | 48 | LOCAL_CFLAGS := $(common_CFLAGS) |
49 | 49 | ||
50 | LOCAL_COPY_HEADERS := \ | ||
51 | $(LIBDRM_H_FILES) \ | ||
52 | $(LIBDRM_INCLUDE_H_FILES) \ | ||
53 | $(LIBDRM_INCLUDE_VMWGFX_H_FILES) | ||
54 | LOCAL_COPY_HEADERS_TO := libdrm | ||
55 | |||
56 | LOCAL_MODULE := libdrm | 50 | LOCAL_MODULE := libdrm |
57 | include $(BUILD_SHARED_LIBRARY) | 51 | include $(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 := \ | |||
21 | LOCAL_CFLAGS := \ | 21 | LOCAL_CFLAGS := \ |
22 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | 22 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 |
23 | 23 | ||
24 | LOCAL_COPY_HEADERS := $(LIBDRM_FREEDRENO_H_FILES) | ||
25 | LOCAL_COPY_HEADERS_TO := freedreno | ||
26 | |||
27 | LOCAL_SHARED_LIBRARIES := \ | 24 | LOCAL_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 := \ | |||
45 | LOCAL_CFLAGS := \ | 45 | LOCAL_CFLAGS := \ |
46 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | 46 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 |
47 | 47 | ||
48 | LOCAL_COPY_HEADERS := $(LIBDRM_INTEL_H_FILES) | ||
49 | LOCAL_COPY_HEADERS_TO := libdrm | ||
50 | |||
51 | LOCAL_SHARED_LIBRARIES := \ | 48 | LOCAL_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 | |||
49 | LOCAL_MODULE := libkms | 49 | LOCAL_MODULE := libkms |
50 | LOCAL_SHARED_LIBRARIES := libdrm | 50 | LOCAL_SHARED_LIBRARIES := libdrm |
51 | 51 | ||
52 | LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm | ||
53 | |||
54 | LOCAL_COPY_HEADERS_TO := libdrm | ||
55 | LOCAL_COPY_HEADERS := $(LIBKMS_H_FILES) | ||
56 | |||
57 | include $(BUILD_SHARED_LIBRARY) | 52 | include $(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 := \ | |||
21 | LOCAL_CFLAGS := \ | 21 | LOCAL_CFLAGS := \ |
22 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | 22 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 |
23 | 23 | ||
24 | LOCAL_COPY_HEADERS := $(LIBDRM_NOUVEAU_H_FILES) | ||
25 | LOCAL_COPY_HEADERS_TO := libdrm | ||
26 | |||
27 | LOCAL_SHARED_LIBRARIES := \ | 24 | LOCAL_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 := \ | |||
21 | LOCAL_CFLAGS := \ | 21 | LOCAL_CFLAGS := \ |
22 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | 22 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 |
23 | 23 | ||
24 | LOCAL_COPY_HEADERS := $(LIBDRM_RADEON_H_FILES) | ||
25 | LOCAL_COPY_HEADERS_TO := libdrm | ||
26 | |||
27 | LOCAL_SHARED_LIBRARIES := \ | 24 | LOCAL_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 := \ | |||
18 | LOCAL_CFLAGS := \ | 18 | LOCAL_CFLAGS := \ |
19 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | 19 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 |
20 | 20 | ||
21 | LOCAL_COPY_HEADERS := rockchip_drm.h rockchip_drmif.h | ||
22 | LOCAL_COPY_HEADERS_TO := libdrm | ||
23 | |||
24 | LOCAL_SHARED_LIBRARIES := \ | 21 | LOCAL_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 := \ | |||
20 | LOCAL_CFLAGS := \ | 20 | LOCAL_CFLAGS := \ |
21 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | 21 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 |
22 | 22 | ||
23 | LOCAL_COPY_HEADERS := tegra.h | ||
24 | LOCAL_COPY_HEADERS_TO := libdrm | ||
25 | |||
26 | LOCAL_SHARED_LIBRARIES := \ | 23 | LOCAL_SHARED_LIBRARIES := \ |
27 | libdrm | 24 | libdrm |
28 | 25 | ||