From 5c1c09e0d28cde4341777b966c21568fd9b51516 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Fri, 23 Jan 2015 14:25:10 +0800 Subject: [PATCH] android: remove duplicate libdrm in LOCAL_SHARED_LIBRARIES v2: Fold libpciaccess and libdrm into a single local_shared_libraries Acked-by: Jan Vesely Signed-off-by: Chih-Wei Huang Signed-off-by: Emil Velikov --- freedreno/Android.mk | 3 --- intel/Android.mk | 2 -- nouveau/Android.mk | 3 --- radeon/Android.mk | 3 --- 4 files changed, 11 deletions(-) diff --git a/freedreno/Android.mk b/freedreno/Android.mk index 243a1e23..22520fbf 100644 --- a/freedreno/Android.mk +++ b/freedreno/Android.mk @@ -24,7 +24,4 @@ LOCAL_CFLAGS := \ LOCAL_COPY_HEADERS := $(LIBDRM_FREEDRENO_H_FILES) LOCAL_COPY_HEADERS_TO := freedreno -LOCAL_SHARED_LIBRARIES := \ - libdrm - include $(BUILD_SHARED_LIBRARY) diff --git a/intel/Android.mk b/intel/Android.mk index f2f21b90..202c0d52 100644 --- a/intel/Android.mk +++ b/intel/Android.mk @@ -30,8 +30,6 @@ include $(LOCAL_PATH)/Makefile.sources LOCAL_MODULE := libdrm_intel LOCAL_MODULE_TAGS := optional -LOCAL_SHARED_LIBRARIES := libdrm - LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES) LOCAL_EXPORT_C_INCLUDE_DIRS += \ $(LOCAL_PATH)/intel diff --git a/nouveau/Android.mk b/nouveau/Android.mk index 734fc219..93c9ec23 100644 --- a/nouveau/Android.mk +++ b/nouveau/Android.mk @@ -24,7 +24,4 @@ LOCAL_CFLAGS := \ LOCAL_COPY_HEADERS := $(LIBDRM_NOUVEAU_H_FILES) LOCAL_COPY_HEADERS_TO := libdrm -LOCAL_SHARED_LIBRARIES := \ - libdrm - include $(BUILD_SHARED_LIBRARY) diff --git a/radeon/Android.mk b/radeon/Android.mk index 9cba546c..71c58bd7 100644 --- a/radeon/Android.mk +++ b/radeon/Android.mk @@ -24,7 +24,4 @@ LOCAL_CFLAGS := \ LOCAL_COPY_HEADERS := $(LIBDRM_RADEON_H_FILES) LOCAL_COPY_HEADERS_TO := libdrm -LOCAL_SHARED_LIBRARIES := \ - libdrm - include $(BUILD_SHARED_LIBRARY)