From 03d2e91d00cb78d49fe170fb19a29107951a8c96 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 22 Jan 2017 16:59:42 +0000 Subject: android: introduce Android.common.mk to reduce boilerplate ... across the makefiles. Currently this isn't much but that will change shortly. As an added bonus this fixes all present and future cases where we've forgotten to strip out the headers from LOCAL_SRC_FILES. In a couple of cases (the tests) we start setting LOCAL_EXPORT_C_INCLUDE_DIRS, which shouldn't be an issue. Cc: Chih-Wei Huang Cc: Rob Herring Signed-off-by: Emil Velikov Reviewed-by: Rob Herring --- Android.mk | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 6ecc4e1c..ec6d5322 100644 --- a/Android.mk +++ b/Android.mk @@ -21,6 +21,8 @@ # IN THE SOFTWARE. # +LIBDRM_COMMON_MK := $(call my-dir)/Android.common.mk + LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -31,7 +33,7 @@ include $(LOCAL_PATH)/Makefile.sources include $(CLEAR_VARS) LOCAL_MODULE := libdrm -LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_FILES)) +LOCAL_SRC_FILES := $(LIBDRM_FILES) LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/include/drm @@ -40,25 +42,26 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include/drm LOCAL_CFLAGS := \ - -DHAVE_VISIBILITY=1 \ - -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 + -DHAVE_VISIBILITY=1 + +include $(LIBDRM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) # Shared library for the device include $(CLEAR_VARS) LOCAL_MODULE := libdrm -LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_FILES)) +LOCAL_SRC_FILES := $(LIBDRM_FILES) LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(LOCAL_PATH) \ $(LOCAL_PATH)/include/drm LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include/drm LOCAL_CFLAGS := \ - -DHAVE_VISIBILITY=1 \ - -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 + -DHAVE_VISIBILITY=1 + +include $(LIBDRM_COMMON_MK) include $(BUILD_SHARED_LIBRARY) include $(call all-makefiles-under,$(LOCAL_PATH)) -- cgit v1.2.1