diff options
author | Emil Velikov <emil.l.velikov@gmail.com> | 2017-01-22 16:59:42 +0000 |
---|---|---|
committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-01-27 15:48:16 +0000 |
commit | 03d2e91d00cb78d49fe170fb19a29107951a8c96 (patch) | |
tree | b8775425a14ddad94aca2b33405c13d1e9407e22 /Android.mk | |
parent | de5b41ef5ab617e5284596e220bc72f6065919f5 (diff) | |
download | drm-03d2e91d00cb78d49fe170fb19a29107951a8c96.tar.gz |
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 <cwhuang@android-x86.org>
Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 17 |
1 files changed, 10 insertions, 7 deletions
@@ -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)) |