aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorEmil Velikov2017-01-22 10:59:42 -0600
committerEmil Velikov2017-01-27 09:48:16 -0600
commit03d2e91d00cb78d49fe170fb19a29107951a8c96 (patch)
treeb8775425a14ddad94aca2b33405c13d1e9407e22 /tests
parentde5b41ef5ab617e5284596e220bc72f6065919f5 (diff)
downloadexternal-libgbm-03d2e91d00cb78d49fe170fb19a29107951a8c96.tar.gz
external-libgbm-03d2e91d00cb78d49fe170fb19a29107951a8c96.tar.xz
external-libgbm-03d2e91d00cb78d49fe170fb19a29107951a8c96.zip
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.mk3
-rw-r--r--tests/proptest/Android.mk3
-rw-r--r--tests/util/Android.mk6
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)
3include $(CLEAR_VARS) 3include $(CLEAR_VARS)
4include $(LOCAL_PATH)/Makefile.sources 4include $(LOCAL_PATH)/Makefile.sources
5 5
6LOCAL_SRC_FILES := $(patsubst %.h, , $(MODETEST_FILES)) 6LOCAL_SRC_FILES := $(MODETEST_FILES)
7 7
8LOCAL_MODULE := modetest 8LOCAL_MODULE := modetest
9 9
10LOCAL_SHARED_LIBRARIES := libdrm 10LOCAL_SHARED_LIBRARIES := libdrm
11LOCAL_STATIC_LIBRARIES := libdrm_util 11LOCAL_STATIC_LIBRARIES := libdrm_util
12 12
13include $(LIBDRM_COMMON_MK)
13include $(BUILD_EXECUTABLE) 14include $(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)
3include $(CLEAR_VARS) 3include $(CLEAR_VARS)
4include $(LOCAL_PATH)/Makefile.sources 4include $(LOCAL_PATH)/Makefile.sources
5 5
6LOCAL_SRC_FILES := $(patsubst %.h, , $(PROPTEST_FILES)) 6LOCAL_SRC_FILES := $(PROPTEST_FILES)
7 7
8LOCAL_MODULE := proptest 8LOCAL_MODULE := proptest
9 9
10LOCAL_SHARED_LIBRARIES := libdrm 10LOCAL_SHARED_LIBRARIES := libdrm
11LOCAL_STATIC_LIBRARIES := libdrm_util 11LOCAL_STATIC_LIBRARIES := libdrm_util
12 12
13include $(LIBDRM_COMMON_MK)
13include $(BUILD_EXECUTABLE) 14include $(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
30 30
31LOCAL_SHARED_LIBRARIES := libdrm 31LOCAL_SHARED_LIBRARIES := libdrm
32 32
33LOCAL_SRC_FILES := $(patsubst %.h, , $(UTIL_FILES)) 33LOCAL_SRC_FILES := $(UTIL_FILES)
34
35# avoid name clashes by requiring users to include util/*.h
36LOCAL_EXPORT_C_INCLUDE_DIRS := $(dir $(LOCAL_PATH))
37 34
35include $(LIBDRM_COMMON_MK)
38include $(BUILD_STATIC_LIBRARY) 36include $(BUILD_STATIC_LIBRARY)