summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Wei Huang <cwhuang@linux.org.tw>2015-03-20 17:05:46 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2015-03-20 17:07:21 +0000
commita3b3c1afb753d1a05bb3f2f5258b9936257a90ec (patch)
tree3e8467c13f24477367c4e2bbb4f184b55cc1788b
parent568b3a095449bee223b6af504bea914ef88a2c5d (diff)
android: simplify the including rule of subdirs
Use android build system functions to include Android.mk of subdirs. Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> [Emil Velikov: Resolve trivial conflicts.] Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
-rw-r--r--Android.mk11
-rw-r--r--tests/Android.mk1
2 files changed, 2 insertions, 10 deletions
diff --git a/Android.mk b/Android.mk
index 0c78fc41..bad4fe14 100644
--- a/Android.mk
+++ b/Android.mk
@@ -45,13 +45,4 @@ LOCAL_CFLAGS := \
include $(BUILD_SHARED_LIBRARY)
-SUBDIRS := \
- freedreno \
- intel \
- nouveau \
- radeon \
- libkms \
- tests/modetest
-
-mkfiles := $(patsubst %,$(LIBDRM_TOP)/%/Android.mk,$(SUBDIRS))
-include $(mkfiles)
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/Android.mk b/tests/Android.mk
new file mode 100644
index 00000000..5053e7d6
--- /dev/null
+++ b/tests/Android.mk
@@ -0,0 +1 @@
+include $(call all-subdir-makefiles)