From ff021215eadc84cf10e8061a33f76c5b3c2afbf3 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 17 Mar 2015 23:30:11 +0000 Subject: [PATCH] android: remove LOCAL_COPY_HEADERS* variables With earlier changes we've implicitly add the relevant directories to the includes list, via LOCAL_EXPORT_C_INCLUDES_DIRS. v2: Update the top Android.mk as well. Signed-off-by: Emil Velikov --- Android.mk | 6 ------ freedreno/Android.mk | 3 --- intel/Android.mk | 3 --- libkms/Android.mk | 3 --- nouveau/Android.mk | 3 --- radeon/Android.mk | 3 --- 6 files changed, 21 deletions(-) diff --git a/Android.mk b/Android.mk index e6d85d48..0c78fc41 100644 --- a/Android.mk +++ b/Android.mk @@ -43,12 +43,6 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := \ -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 -LOCAL_COPY_HEADERS := \ - $(LIBDRM_H_FILES) \ - $(LIBDRM_INCLUDE_H_FILES) \ - $(LIBDRM_INCLUDE_VMWGFX_H_FILES) - -LOCAL_COPY_HEADERS_TO := libdrm include $(BUILD_SHARED_LIBRARY) SUBDIRS := \ diff --git a/freedreno/Android.mk b/freedreno/Android.mk index 9031d61b..2645f737 100644 --- a/freedreno/Android.mk +++ b/freedreno/Android.mk @@ -15,7 +15,4 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_CFLAGS := \ -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 -LOCAL_COPY_HEADERS := $(LIBDRM_FREEDRENO_H_FILES) -LOCAL_COPY_HEADERS_TO := freedreno - include $(BUILD_SHARED_LIBRARY) diff --git a/intel/Android.mk b/intel/Android.mk index 73971107..0f498ec2 100644 --- a/intel/Android.mk +++ b/intel/Android.mk @@ -39,9 +39,6 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := \ -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 -LOCAL_COPY_HEADERS := $(LIBDRM_INTEL_H_FILES) -LOCAL_COPY_HEADERS_TO := libdrm - LOCAL_SHARED_LIBRARIES := \ libdrm \ libpciaccess diff --git a/libkms/Android.mk b/libkms/Android.mk index 3c400de5..12cf8448 100644 --- a/libkms/Android.mk +++ b/libkms/Android.mk @@ -47,7 +47,4 @@ LOCAL_SHARED_LIBRARIES := libdrm LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -LOCAL_COPY_HEADERS_TO := libdrm -LOCAL_COPY_HEADERS := $(LIBKMS_H_FILES) - include $(BUILD_SHARED_LIBRARY) diff --git a/nouveau/Android.mk b/nouveau/Android.mk index 5bc325c3..abc6aef7 100644 --- a/nouveau/Android.mk +++ b/nouveau/Android.mk @@ -15,7 +15,4 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_CFLAGS := \ -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 -LOCAL_COPY_HEADERS := $(LIBDRM_NOUVEAU_H_FILES) -LOCAL_COPY_HEADERS_TO := libdrm - include $(BUILD_SHARED_LIBRARY) diff --git a/radeon/Android.mk b/radeon/Android.mk index f12e6318..ace34080 100644 --- a/radeon/Android.mk +++ b/radeon/Android.mk @@ -15,7 +15,4 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_CFLAGS := \ -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 -LOCAL_COPY_HEADERS := $(LIBDRM_RADEON_H_FILES) -LOCAL_COPY_HEADERS_TO := libdrm - include $(BUILD_SHARED_LIBRARY)