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 /tests | |
| parent | de5b41ef5ab617e5284596e220bc72f6065919f5 (diff) | |
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 'tests')
| -rw-r--r-- | tests/modetest/Android.mk | 3 | ||||
| -rw-r--r-- | tests/proptest/Android.mk | 3 | ||||
| -rw-r--r-- | tests/util/Android.mk | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/modetest/Android.mk b/tests/modetest/Android.mk index 6a7f4069..c1a71fd9 100644 --- a/tests/modetest/Android.mk +++ b/tests/modetest/Android.mk @@ -3,11 +3,12 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) include $(LOCAL_PATH)/Makefile.sources -LOCAL_SRC_FILES := $(patsubst %.h, , $(MODETEST_FILES)) +LOCAL_SRC_FILES := $(MODETEST_FILES) LOCAL_MODULE := modetest LOCAL_SHARED_LIBRARIES := libdrm LOCAL_STATIC_LIBRARIES := libdrm_util +include $(LIBDRM_COMMON_MK) include $(BUILD_EXECUTABLE) diff --git a/tests/proptest/Android.mk b/tests/proptest/Android.mk index badeb588..91a590fc 100644 --- a/tests/proptest/Android.mk +++ b/tests/proptest/Android.mk @@ -3,11 +3,12 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) include $(LOCAL_PATH)/Makefile.sources -LOCAL_SRC_FILES := $(patsubst %.h, , $(PROPTEST_FILES)) +LOCAL_SRC_FILES := $(PROPTEST_FILES) LOCAL_MODULE := proptest LOCAL_SHARED_LIBRARIES := libdrm LOCAL_STATIC_LIBRARIES := libdrm_util +include $(LIBDRM_COMMON_MK) include $(BUILD_EXECUTABLE) diff --git a/tests/util/Android.mk b/tests/util/Android.mk index c9d087e3..7656c4c2 100644 --- a/tests/util/Android.mk +++ b/tests/util/Android.mk @@ -30,9 +30,7 @@ LOCAL_MODULE := libdrm_util LOCAL_SHARED_LIBRARIES := libdrm -LOCAL_SRC_FILES := $(patsubst %.h, , $(UTIL_FILES)) - -# avoid name clashes by requiring users to include util/*.h -LOCAL_EXPORT_C_INCLUDE_DIRS := $(dir $(LOCAL_PATH)) +LOCAL_SRC_FILES := $(UTIL_FILES) +include $(LIBDRM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) |